Commit: 5610741f0490720768d18babf755761c26c4415a
Author: Nicholas Bishop
Date: Mon Jan 26 01:53:26 2015 +0100
Branches: cycles-ptex-12
https://developer.blender.org/rB5610741f0490720768d18babf755761c26c4415a
Remove commented-out code
===================================================================
M intern/cycles/blender/blender_shader.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_shader.cpp
b/intern/cycles/blender/blender_shader.cpp
index 5797624..7cd068a 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -594,32 +594,10 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData
b_data, BL::Scene b_scen
else if (b_node.is_a(&RNA_ShaderNodeTexPtex)) {
// TODO
BL::ShaderNodeTexPtex b_image_node(b_node);
- //BL::Image b_image(b_image_node.image());
PtexTextureNode *image = new PtexTextureNode();
+
image->ptex = true;
image->ptex_layer = "TODO";
- // if(b_image) {
- // int scene_frame = b_scene.frame_current();
- // int image_frame =
image_user_frame_number(b_image_node.image_user(), scene_frame);
- // image->filename = b_image.name() + "@" +
string_printf("%d", image_frame);
- // image->builtin_data = b_image.ptr.data;
-
-
- // image->animated =
b_image_node.image_user().use_auto_refresh();
- // image->use_alpha = b_image.use_alpha();
-
- // /* TODO(sergey): Does not work properly when we change
builtin type. */
- // if (b_image.is_updated()) {
- //
scene->image_manager->tag_reload_image(image->filename,
- //
image->builtin_data,
- //
(InterpolationType)b_image_node.interpolation());
- // }
- // }
- // image->color_space =
ImageTextureNode::color_space_enum[(int)b_image_node.color_space()];
- // 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();
- // get_tex_mapping(&image->tex_mapping,
b_image_node.texture_mapping());
node = image;
}
else if (b_node.is_a(&RNA_ShaderNodeTexEnvironment)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
