diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:39 +0400 |
| commit | d7d8c668ca78bf2e4f3a7a825db8e5b197d7a4b7 (patch) | |
| tree | 93db8e17508b017ad484ef903320b02740e249b4 /intern/cycles/blender/blender_shader.cpp | |
| parent | 503785649d1aa96cd162a8cd2b9ed7b36abcf21c (diff) | |
Fix #30803: shader node Mapping location property conflicted with based class
location property (for the node editor), now renamed to "translation".
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index bea434bb7b6..74d41208287 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -80,7 +80,7 @@ static void get_tex_mapping(TextureMapping *mapping, BL::TexMapping b_mapping) if(!b_mapping) return; - mapping->translation = get_float3(b_mapping.location()); + mapping->translation = get_float3(b_mapping.translation()); mapping->rotation = get_float3(b_mapping.rotation()); mapping->scale = get_float3(b_mapping.scale()); @@ -94,7 +94,7 @@ static void get_tex_mapping(TextureMapping *mapping, BL::ShaderNodeMapping b_map if(!b_mapping) return; - mapping->translation = get_float3(b_mapping.location()); + mapping->translation = get_float3(b_mapping.translation()); mapping->rotation = get_float3(b_mapping.rotation()); mapping->scale = get_float3(b_mapping.scale()); } |