[Bf-blender-cvs] [4774e906e19] soc-2018-hair-shader: Copy geometry data when allocating the OSL shader closure

L. E. Segovia noreply at git.blender.org
Thu May 31 21:54:07 CEST 2018


Commit: 4774e906e19816b720c20271b9f9db28bb89debe
Author: L. E. Segovia
Date:   Thu May 31 19:53:42 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB4774e906e19816b720c20271b9f9db28bb89debe

Copy geometry data when allocating the OSL shader closure

This may fix https://blenderartists.org/t/cycless-gsoc-2018-project-new-hair-shader-expectations/1103070/25.
However, I didn't run into it in MacOS or Windows, w/ OSL, CPU, or CUDA.

Ref T54796

===================================================================

M	intern/cycles/kernel/osl/osl_closures.cpp

===================================================================

diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index b4f0230d425..43d9a37dfbc 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -207,6 +207,7 @@ public:
 		}
 
 		bsdf->extra = extra;
+		bsdf->extra->geom = params.extra->geom;
 		return bsdf;
 	}



More information about the Bf-blender-cvs mailing list