diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-12-23 12:49:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-23 14:14:17 +0300 |
| commit | b9311b5e5a51fec85e3bb3c1d3eaa8a2dcc839e3 (patch) | |
| tree | 585552fa1062a539bef4e66850ad265946030c13 /intern/cycles/render/object.cpp | |
| parent | 2ae39ff6b192b259e6a2c593d72a9c9008a029c4 (diff) | |
Cycles: Make object flag names more obvious that hey are object and not shader
Diffstat (limited to 'intern/cycles/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index c592b62829e..8342f376836 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -410,7 +410,7 @@ void ObjectManager::device_update_object_transform(UpdateObejctTransformState *s /* Object flag. */ if(ob->use_holdout) { - flag |= SD_HOLDOUT_MASK; + flag |= SD_OBJECT_HOLDOUT_MASK; } state->object_flag[object_index] = flag; @@ -716,9 +716,9 @@ void ObjectManager::apply_static_transforms(DeviceScene *dscene, Scene *scene, u if(progress.get_cancel()) return; } - object_flag[i] |= SD_TRANSFORM_APPLIED; + object_flag[i] |= SD_OBJECT_TRANSFORM_APPLIED; if(object->mesh->transform_negative_scaled) - object_flag[i] |= SD_NEGATIVE_SCALE_APPLIED; + object_flag[i] |= SD_OBJECT_NEGATIVE_SCALE_APPLIED; } else have_instancing = true; |