[Bf-blender-cvs] [8c0f936] master: Fix T38134: missing cycles update when removing world volume scatter shader.

Brecht Van Lommel noreply at git.blender.org
Thu Jan 9 01:27:50 CET 2014


Commit: 8c0f9365c0387911a9891eac9e9a561c02dc9964
Author: Brecht Van Lommel
Date:   Thu Jan 9 01:26:43 2014 +0100
https://developer.blender.org/rB8c0f9365c0387911a9891eac9e9a561c02dc9964

Fix T38134: missing cycles update when removing world volume scatter shader.

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

M	intern/cycles/kernel/kernel_path_state.h

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

diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h
index d9af629..c3f6175 100644
--- a/intern/cycles/kernel/kernel_path_state.h
+++ b/intern/cycles/kernel/kernel_path_state.h
@@ -41,9 +41,9 @@ ccl_device_inline void path_state_init(KernelGlobals *kg, PathState *state, RNG
 #endif
 
 #ifdef __VOLUME__
-	if(kernel_data.integrator.use_volumes) {
-		state->volume_bounce = 0;
+	state->volume_bounce = 0;
 
+	if(kernel_data.integrator.use_volumes) {
 		/* initialize volume stack with volume we are inside of */
 		kernel_volume_stack_init(kg, state->volume_stack);
 		/* seed RNG for cases where we can't use stratified samples */




More information about the Bf-blender-cvs mailing list