diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 14:41:01 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 14:41:01 +0400 |
| commit | d404c31e8d002a00229bdd91769ca30c6a0e3e4d (patch) | |
| tree | dc5a116a429fea662185b9e22eddbcd184d0d437 /intern/cycles/blender/blender_sync.h | |
| parent | 6a128eee7b8a49e5d7344f8982c82fc2aa97dad6 (diff) | |
Cycles: fix sync issue with group instances.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index f1fce37bfaf..732a1b30260 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -76,7 +76,7 @@ private: void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree); Mesh *sync_mesh(BL::Object b_ob, bool object_updated); void sync_object(BL::Object b_parent, int b_index, BL::Object b_object, Transform& tfm); - void sync_light(BL::Object b_ob, Transform& tfm); + void sync_light(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm); /* util */ void find_shader(BL::ID id, vector<uint>& used_shaders); @@ -91,7 +91,7 @@ private: id_map<void*, Shader> shader_map; id_map<ObjectKey, Object> object_map; id_map<void*, Mesh> mesh_map; - id_map<void*, Light> light_map; + id_map<ObjectKey, Light> light_map; void *world_map; bool world_recalc; |