[Bf-blender-cvs] [eaaa893] blender-v2.72-release: Cycles: Correct object flags bitfield, was missing negative scale there

Sergey Sharybin noreply at git.blender.org
Fri Oct 3 15:24:20 CEST 2014


Commit: eaaa8934ae270c919128cb533cf44b786aae810c
Author: Sergey Sharybin
Date:   Sun Sep 28 14:13:36 2014 +0600
Branches: blender-v2.72-release
https://developer.blender.org/rBeaaa8934ae270c919128cb533cf44b786aae810c

Cycles: Correct object flags bitfield, was missing negative scale there

It's quite a few of circumstances to be met to hit the case when render
wouldn't be correct.

Better to be ported to the final release.

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

M	intern/cycles/kernel/kernel_types.h

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 1f61d80..d17b7c8 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -616,7 +616,7 @@ enum ShaderDataFlag {
 	SD_TRANSFORM_APPLIED = 2097152,		/* vertices have transform applied */
 	SD_NEGATIVE_SCALE_APPLIED = 4194304,	/* vertices have negative scale applied */
 
-	SD_OBJECT_FLAGS = (SD_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_TRANSFORM_APPLIED)
+	SD_OBJECT_FLAGS = (SD_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_TRANSFORM_APPLIED|SD_NEGATIVE_SCALE_APPLIED)
 };
 
 struct KernelGlobals;




More information about the Bf-blender-cvs mailing list