Merge pull request #6121 from danieldresser-ie/instancerRegress

Instancer : Fix issue with wrong prototypes in encapsulated render
GafferHQ · Oct 31, 2024 · c9aa40f · c9aa40f
2 parents bf4664c + 27d6529
commit c9aa40f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Changes.md b/Changes.md
@@ -9,6 +9,7 @@ Fixes
   - Fixed handling of shader colour component to float connections in Cycles.
   - Added `CORTEX_STARTUP_PATHS` to match the Linux wrapper.
 - PlugPopup : Fixed error when displaying a popup with no PlugValueWidget.
+- Instancer : Fixed issue where wrong prototypes were sometimes used in encapsulated renders.
 
 1.5.0.0 (relative to 1.4.15.0)
 =======

diff --git a/src/GafferScene/Instancer.cpp b/src/GafferScene/Instancer.cpp
@@ -2711,6 +2711,7 @@ struct Prototype : public IECore::RefCounted
 
 		IECore::MurmurHash h = hash;
 		h.append( prototypeContext->hash() );
+		h.append( *prototypeRoot );
 
 		// We find the capsules using the engine at shutter open, but the time used to construct the capsules
 		// must be the on-frame time, since the capsules will add their own shutter