Merge branch 'dev' into SubLayersRec

README.md

@@ -104,7 +104,7 @@ Core loading feature(both USDA and USDC) is now working and production-grade(And
 Somewhat working Tydra framwork for rendering USD model with OpenGL/Vulkan-like renderer. https://github.com/syoyo/tinyusdz/issues/148
 
 v0.8.0 is basically Flattened scene only(i.e, USDA/USDC generated by using pxrUSD's `usdcat --flatten` or USDZ scene).
-Composition features are work-in-progress(experimental Composition feature support in v0.8.0. Better composition feature in next major release v0.9.0(Q3/2024 expected) planned)
+Composition features are work-in-progress(experimental Composition feature support in v0.8.0. Better composition feature in next major release v0.9.0(Q2/2025 expected) planned)
 
 Remaining tasks for v0.8.0 release are writing examples, demos and utility functions(Tydra. Especially access to Material/Shader attributes).
 
@@ -127,8 +127,8 @@ Remaining tasks for v0.8.0 release are writing examples, demos and utility funct
 * [ ] Basic C API(`c-tinyusd`) for language bindings
   * [ ]  [examples/c_api_example](examples/c_api_example)
   * [ ] Basic Python binding
-* [ ] Write simple SDL viewer example(2024 Summer expected)
-* [ ] Write iOS and Android example(2024 Winter expected)
+* [ ] Write simple SDL viewer example(2025 Spring expected)
+* [ ] Write iOS and Android example(2025  expected)
 * [ ] Write Vision OS example?
 * [ ] Vulkan or OptiX/HIP RT raytracing viewer example
 * [ ] USD <-> glTF converter example
@@ -181,7 +181,7 @@ Example viewer is just for demo purpose.
 
 If you need commercial support, eco-system development(e.g. plug-ins, DCC tools on top of TinyUSDZ) or production-grade USDZ model viewer(e.g. embed TinyUSDZ to your AR app, 3D NFT Android mobile viewer capable of displaying (encrypted) USDZ model), please contact Light Transport Entertainment, Inc. : [https://goo.gl/forms/1p6uGcOKWGpXPHkA2 ](https://forms.gle/PeDRAgYM5ET9SjGs5)
 
-We are also looking for sponsors. If you are interested in sponsoring(or donating) to TinyUSDZ project, please also contact Light Transport Entertainment, Inc. for details: [https://goo.gl/forms/1p6uGcOKWGpXPHkA2 ](https://forms.gle/PeDRAgYM5ET9SjGs5)
+We are also looking for sponsors. If you are interested in sponsoring(or donating to) TinyUSDZ project, use Github Sponsors to sponsor TinyUSDZ propject, or contact Light Transport Entertainment, Inc. for details: [https://goo.gl/forms/1p6uGcOKWGpXPHkA2 ](https://forms.gle/PeDRAgYM5ET9SjGs5)
 
 
 ## Projects using TinyUSDZ

src/composition.cc

@@ -1255,9 +1255,11 @@ static bool InheritPrimSpecImpl(PrimSpec &dst, const PrimSpec &src,
   // Then override it with `dst`
   PrimSpec ps = src;  // copy
 
-  // Keep PrimSpec name, typeName and spec from `dst`
+  // Keep PrimSpec name, typeName (if not empty) and spec from `dst`
   ps.name() = dst.name();
-  ps.typeName() = dst.typeName();
+  if (!dst.typeName().empty()) {
+    ps.typeName() = dst.typeName();
+  }
   ps.specifier() = dst.specifier();
 
   // Override metadataum

src/prim-types.cc

@@ -2175,7 +2175,8 @@ bool Layer::find_primspec_at(const Path &path, const PrimSpec **ps,
     auto ret = _primspec_path_cache.find(path.prim_part());
     if (ret != _primspec_path_cache.end()) {
       DCOUT("Found cache.");
-      return ret->second;
+      (*ps) = ret->second;
+      return true;
     }
   }