diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-07 21:00:15 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-05-07 21:00:56 +0400 |
commit | edd78fb3085ef960b59925269ef967daf0256d10 (patch) | |
tree | 8973dfb1b4b0cc7d70d99deedc29582a20116ff3 | |
parent | 83cdd5887f10e1998a434fb1632e0b76ec938d91 (diff) |
Fix cycles crash after recent use alpha commit.
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 7f384d9a1e7..ddbb40da7db 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -546,9 +546,9 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen } image->animated = b_image_node.image_user().use_auto_refresh(); + image->use_alpha = b_image.use_alpha(); } image->color_space = ImageTextureNode::color_space_enum[(int)b_image_node.color_space()]; - image->use_alpha = b_image.use_alpha(); image->projection = ImageTextureNode::projection_enum[(int)b_image_node.projection()]; image->interpolation = (InterpolationType)b_image_node.interpolation(); image->projection_blend = b_image_node.projection_blend(); @@ -575,9 +575,10 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen env->animated = b_env_node.image_user().use_auto_refresh(); env->builtin_data = NULL; } + + env->use_alpha = b_image.use_alpha(); } env->color_space = EnvironmentTextureNode::color_space_enum[(int)b_env_node.color_space()]; - env->use_alpha = b_image.use_alpha(); env->projection = EnvironmentTextureNode::projection_enum[(int)b_env_node.projection()]; get_tex_mapping(&env->tex_mapping, b_env_node.texture_mapping()); node = env; |