diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-13 18:52:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-13 18:56:34 +0300 |
| commit | 3f0113be4ddb75e1e4dd159e58112e8c45ebdb12 (patch) | |
| tree | d01da960c1ad581858d9d9ad783067d51ffdbc35 /intern/cycles | |
| parent | be2994a6f12e56fb24365c1df3fd24216c8e6913 (diff) | |
Fix T43156: Cycles incorrect final render, proper viewport with moblur disabled
Really stupid issue caused by typo in bitfield bit lead to bit conflict,
Not sure how it was done, could be some bad merge conflict resolve in the
original commit or just pure man stupidnes.
This is a nice example when having set of small test render scenes hooked
to the ctest would really help.
It's probably not that stopper issue (even tho still quite bad) since it
was made 2 months ago. But if we ever do 'a' this time it's a nice change
to include.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 82619b3f854..a230acb2fbc 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -629,7 +629,7 @@ enum ShaderDataFlag { SD_NEGATIVE_SCALE_APPLIED = (1 << 23), /* vertices have negative scale applied */ SD_OBJECT_HAS_VOLUME = (1 << 24), /* object has a volume shader */ SD_OBJECT_INTERSECTS_VOLUME = (1 << 25), /* object intersects AABB of an object with volume shader */ - SD_OBJECT_HAS_VERTEX_MOTION = (1 << 21), /* has position for motion vertices */ + SD_OBJECT_HAS_VERTEX_MOTION = (1 << 26), /* has position for motion vertices */ SD_OBJECT_FLAGS = (SD_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_TRANSFORM_APPLIED| SD_NEGATIVE_SCALE_APPLIED|SD_OBJECT_HAS_VOLUME| |