diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 34585260cdb..7b596b18a49 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1085,7 +1085,7 @@ class CyclesTexture_PT_mapping(CyclesButtonsPanel, Panel): mapping = node.texture_mapping - layout.prop(mapping, "type", expand=True) + layout.prop(mapping, "vector_type", expand=True) row = layout.row() diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index d915d51dfd8..c6c5a4c5dbc 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -147,7 +147,7 @@ static void get_tex_mapping(TextureMapping *mapping, BL::TexMapping b_mapping) mapping->translation = get_float3(b_mapping.translation()); mapping->rotation = get_float3(b_mapping.rotation()); mapping->scale = get_float3(b_mapping.scale()); - mapping->type = (TextureMapping::Type)b_mapping.type(); + mapping->type = (TextureMapping::Type)b_mapping.vector_type(); mapping->x_mapping = (TextureMapping::Mapping)b_mapping.mapping_x(); mapping->y_mapping = (TextureMapping::Mapping)b_mapping.mapping_y(); @@ -162,7 +162,7 @@ static void get_tex_mapping(TextureMapping *mapping, BL::ShaderNodeMapping b_map mapping->translation = get_float3(b_mapping.translation()); mapping->rotation = get_float3(b_mapping.rotation()); mapping->scale = get_float3(b_mapping.scale()); - mapping->type = (TextureMapping::Type)b_mapping.type(); + mapping->type = (TextureMapping::Type)b_mapping.vector_type(); mapping->use_minmax = b_mapping.use_min() || b_mapping.use_max(); |