[Bf-blender-cvs] [7a15b938bde] master: Cleanup: fix use of wrong constant

Patrick Mours noreply at git.blender.org
Mon Aug 26 10:35:14 CEST 2019


Commit: 7a15b938bde587aa12290413d6be61619b51fe2e
Author: Patrick Mours
Date:   Wed Aug 21 12:23:11 2019 +0200
Branches: master
https://developer.blender.org/rB7a15b938bde587aa12290413d6be61619b51fe2e

Cleanup: fix use of wrong constant

Ref D5363

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

M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index cc85110bdd8..20914b0ee4d 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -1275,7 +1275,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
    */
   if (stack_index == 0 && kernel_data.background.volume_shader == SHADER_NONE) {
     stack[0].shader = kernel_data.background.volume_shader;
-    stack[0].object = PRIM_NONE;
+    stack[0].object = OBJECT_NONE;
     stack[1].shader = SHADER_NONE;
   }
   else {



More information about the Bf-blender-cvs mailing list