diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-28 19:49:52 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-28 20:22:51 +0300 |
commit | 7c7f3776dd0e2f0125a4065e4b4d070a8666ef7c (patch) | |
tree | c7be442387f617b6066a22cb1056d3b84f9566bc /intern | |
parent | 98ecab1af07a6f8f31b7889d1da92593deb87ae2 (diff) |
Use collection and instance terminology in Python API
This follows naming convention agreed on in T56648.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_object.cpp | 22 | ||||
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index a57edf9b940..bcab5276060 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -506,15 +506,15 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph, } static bool object_render_hide_original(BL::Object::type_enum ob_type, - BL::Object::dupli_type_enum dupli_type) + BL::Object::instance_type_enum dupli_type) { /* metaball exception, they duplicate self */ if(ob_type == BL::Object::type_META) return false; - return (dupli_type == BL::Object::dupli_type_VERTS || - dupli_type == BL::Object::dupli_type_FACES || - dupli_type == BL::Object::dupli_type_FRAMES); + return (dupli_type == BL::Object::instance_type_VERTS || + dupli_type == BL::Object::instance_type_FACES || + dupli_type == BL::Object::instance_type_FRAMES); } static bool object_render_hide(BL::Object& b_ob, @@ -541,15 +541,15 @@ static bool object_render_hide(BL::Object& b_ob, } /* Both mode_PREVIEW and mode_VIEWPORT are treated the same here.*/ - const bool show_duplicator = depsgraph_mode == BL::Depsgraph::mode_RENDER - ? b_ob.show_duplicator_for_render() - : b_ob.show_duplicator_for_viewport(); + const bool show_instancer = depsgraph_mode == BL::Depsgraph::mode_RENDER + ? b_ob.show_instancer_for_render() + : b_ob.show_instancer_for_viewport(); if(has_particles) { - show_emitter = show_duplicator; + show_emitter = show_instancer; hide_emitter = !show_emitter; - } else if(b_ob.is_duplicator()) { - if(top_level || show_duplicator) { + } else if(b_ob.is_instancer()) { + if(top_level || show_instancer) { hide_as_dupli_parent = true; } } @@ -558,7 +558,7 @@ static bool object_render_hide(BL::Object& b_ob, BL::Object parent = b_ob.parent(); while(parent) { if(object_render_hide_original(b_ob.type(), - parent.dupli_type())) + parent.instance_type())) { if(parent_hide) { hide_as_dupli_child_original = true; diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 604c134a2f7..b04a0394141 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -812,7 +812,7 @@ static ShaderNode *add_node(Scene *scene, else if(b_node.is_a(&RNA_ShaderNodeTexCoord)) { BL::ShaderNodeTexCoord b_tex_coord_node(b_node); TextureCoordinateNode *tex_coord = new TextureCoordinateNode(); - tex_coord->from_dupli = b_tex_coord_node.from_dupli(); + tex_coord->from_dupli = b_tex_coord_node.from_instancer(); if(b_tex_coord_node.object()) { tex_coord->use_transform = true; tex_coord->ob_tfm = get_transform(b_tex_coord_node.object().matrix_world()); @@ -865,7 +865,7 @@ static ShaderNode *add_node(Scene *scene, BL::ShaderNodeUVMap b_uvmap_node(b_node); UVMapNode *uvm = new UVMapNode(); uvm->attribute = b_uvmap_node.uv_map(); - uvm->from_dupli = b_uvmap_node.from_dupli(); + uvm->from_dupli = b_uvmap_node.from_instancer(); node = uvm; } else if(b_node.is_a(&RNA_ShaderNodeTexPointDensity)) { |