diff options
Diffstat (limited to 'intern/cycles/scene/object.h')
| -rw-r--r-- | intern/cycles/scene/object.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/scene/object.h b/intern/cycles/scene/object.h index 55689ccfa58..c41f1416180 100644 --- a/intern/cycles/scene/object.h +++ b/intern/cycles/scene/object.h @@ -55,6 +55,9 @@ class Object : public Node { NODE_SOCKET_API(float, shadow_terminator_shading_offset) NODE_SOCKET_API(float, shadow_terminator_geometry_offset) + NODE_SOCKET_API(bool, is_caustics_caster) + NODE_SOCKET_API(bool, is_caustics_receiver) + NODE_SOCKET_API(float3, dupli_generated) NODE_SOCKET_API(float2, dupli_uv) @@ -63,6 +66,8 @@ class Object : public Node { NODE_SOCKET_API(float, ao_distance) + NODE_SOCKET_API(ustring, lightgroup) + /* Set during device update. */ bool intersects_volume; @@ -166,7 +171,8 @@ class ObjectManager { protected: void device_update_object_transform(UpdateObjectTransformState *state, Object *ob, - bool update_all); + bool update_all, + const Scene *scene); void device_update_object_transform_task(UpdateObjectTransformState *state); bool device_update_object_transform_pop_work(UpdateObjectTransformState *state, int *start_index, |