[Bf-blender-cvs] [c0c037f] master: OSX/clang: Fix T41123, crashing osl when optimization level > O0 is used for osl_shaders.cpp

Jens Verwiebe noreply at git.blender.org
Wed Aug 6 13:25:39 CEST 2014


Commit: c0c037f41d934344cebedad84340fa880133612e
Author: Jens Verwiebe
Date:   Wed Aug 6 13:25:06 2014 +0200
Branches: master
https://developer.blender.org/rBc0c037f41d934344cebedad84340fa880133612e

OSX/clang: Fix T41123, crashing osl when optimization level > O0 is used for osl_shaders.cpp

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 164df41..bd788c6 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -524,14 +524,14 @@ typedef struct ShaderClosure {
 	ClosureType type;
 	float3 weight;
 
-	float sample_weight;
-
 	float data0;
 	float data1;
 	float data2;
 
 	float3 N;
 	float3 T;
+	
+	float sample_weight;
 
 #ifdef __OSL__
 	void *prim;




More information about the Bf-blender-cvs mailing list