Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/scene/object.h')
-rw-r--r--intern/cycles/scene/object.h5
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,