Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-11-28 19:49:52 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-28 20:22:51 +0300
commit7c7f3776dd0e2f0125a4065e4b4d070a8666ef7c (patch)
treec7be442387f617b6066a22cb1056d3b84f9566bc /intern/cycles/blender/blender_shader.cpp
parent98ecab1af07a6f8f31b7889d1da92593deb87ae2 (diff)
Use collection and instance terminology in Python API
This follows naming convention agreed on in T56648.
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
-rw-r--r--intern/cycles/blender/blender_shader.cpp4
1 files changed, 2 insertions, 2 deletions
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)) {