diff options
| author | Dilith Jayakody <dilithjay@gmail.com> | 2022-04-03 05:38:54 +0300 |
|---|---|---|
| committer | Dilith Jayakody <dilithjay@gmail.com> | 2022-04-03 05:38:54 +0300 |
| commit | bb44667a2e8f9c91548a574443e750583918e996 (patch) | |
| tree | 12347d0a95971a9b7cd7d11786ccc2f948b214c6 /intern/cycles/scene/object.h | |
| parent | 2579367c93296eb2ab1da0b51dc107287dc09fd3 (diff) | |
| parent | 79ff65d07bac0ecf0170542f86dc03a0228b53d5 (diff) | |
Merge branch 'master' into soc-2021-curvessoc-2021-curves
Diffstat (limited to 'intern/cycles/scene/object.h')
| -rw-r--r-- | intern/cycles/scene/object.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/scene/object.h b/intern/cycles/scene/object.h index 561ecd4e7e9..c41f1416180 100644 --- a/intern/cycles/scene/object.h +++ b/intern/cycles/scene/object.h @@ -66,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; @@ -169,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, |