diff options
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 4ec46424b5a..69fee9551dd 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -43,6 +43,7 @@ class Mesh; class Object; class ParticleSystem; class Scene; +class SceneLayer; class Shader; class ShaderGraph; class ShaderNode; @@ -51,6 +52,7 @@ class BlenderSync { public: BlenderSync(BL::RenderEngine& b_engine, BL::BlendData& b_data, + BL::Depsgraph& b_graph, BL::Scene& b_scene, Scene *scene, bool preview, @@ -115,16 +117,16 @@ 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); + Mesh *sync_mesh(BL::Object& b_ob, + BL::Object& b_ob_instance, + bool object_updated, + bool hide_tris); 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, + Object *sync_object(BL::Depsgraph::duplis_iterator& b_dupli_iter, uint layer_flag, float motion_time, bool hide_tris, @@ -133,6 +135,7 @@ private: void sync_light(BL::Object& b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object& b_ob, + BL::Object& b_ob_instance, Transform& tfm, bool *use_portal); void sync_background_light(bool use_portal); @@ -161,7 +164,9 @@ private: /* variables */ BL::RenderEngine b_engine; BL::BlendData b_data; + BL::Depsgraph b_depsgraph; BL::Scene b_scene; + BL::SceneLayer b_scene_layer; id_map<void*, Shader> shader_map; id_map<ObjectKey, Object> object_map; @@ -191,7 +196,6 @@ private: use_background_ao(true), use_surfaces(true), use_hair(true), - use_viewport_visibility(false), samples(0), bound_samples(false) {} @@ -205,7 +209,6 @@ private: bool use_background_ao; bool use_surfaces; bool use_hair; - bool use_viewport_visibility; int samples; bool bound_samples; } render_layer; |