diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-08 23:03:23 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-08 23:03:23 +0300 |
| commit | 70c588bc3fcf2fdd404e8b61f02b6c5d7c57929e (patch) | |
| tree | e9043564f17860709d1091c8f94d2e1585c6d35b /intern/cycles/blender/blender_sync.h | |
| parent | 780d257e6e2b5c114fc0d17d5f29d41c03dbb2c7 (diff) | |
| parent | d1c7efd73fcf428f5bdd9dea989977902e89e6c5 (diff) | |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
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 6e40b8dee9e..8d2f3246e83 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -84,12 +84,12 @@ private: void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree); Mesh *sync_mesh(BL::Object b_parent, bool object_updated, bool hide_tris, BL::DupliObject b_dupli_ob = PointerRNA_NULL); - void sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_ob, bool motion, int time_index = 0); + void sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_parent, bool motion, int time_index = 0, BL::DupliObject b_dupli_ob = PointerRNA_NULL); Object *sync_object(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::DupliObject b_dupli_ob, Transform& tfm, uint layer_flag, float motion_time, bool hide_tris); void sync_light(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object b_ob, Transform& tfm); void sync_background_light(); - void sync_mesh_motion(BL::Object b_ob, Object *object, float motion_time); + void sync_mesh_motion(BL::Object b_parent, Object *object, float motion_time, BL::DupliObject b_dupli_ob = PointerRNA_NULL); void sync_camera_motion(BL::Object b_ob, float motion_time); /* particles */ |