diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-20 16:48:51 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-23 14:46:33 +0300 |
| commit | 40b817c7d454fb06f3434f57ae4eec7bdac9d273 (patch) | |
| tree | c1547c5f3a79ddcc5932ca422029aff04f370446 /intern/cycles/blender/blender_sync.h | |
| parent | 129ab67f2ea07e0b8c10eeef4798ddbdc258bca7 (diff) | |
Working implementation of cache reading for dupli data during renders.
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 70340cc3a49..6ca3f260e10 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -83,7 +83,7 @@ private: void sync_curve_settings(); void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree); - Mesh *sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tris, BL::Object b_ob_parent = PointerRNA_NULL); + 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); 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); |