[Bf-blender-cvs] [545413d] object_nodes: Removed texture nodes.
Lukas Tönne
noreply at git.blender.org
Fri May 13 11:24:02 CEST 2016
Commit: 545413d8e82348f6e797638ee5d9af10540829d6
Author: Lukas Tönne
Date: Fri May 13 07:50:07 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB545413d8e82348f6e797638ee5d9af10540829d6
Removed texture nodes.
The node tree type is left alone for now, only the node types are removed.
===================================================================
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_add.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_texture.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/NOD_texture.h
M source/blender/nodes/texture/node_texture_tree.c
D source/blender/nodes/texture/node_texture_util.c
D source/blender/nodes/texture/node_texture_util.h
D source/blender/nodes/texture/nodes/node_texture_at.c
D source/blender/nodes/texture/nodes/node_texture_bricks.c
D source/blender/nodes/texture/nodes/node_texture_checker.c
D source/blender/nodes/texture/nodes/node_texture_common.c
D source/blender/nodes/texture/nodes/node_texture_compose.c
D source/blender/nodes/texture/nodes/node_texture_coord.c
D source/blender/nodes/texture/nodes/node_texture_curves.c
D source/blender/nodes/texture/nodes/node_texture_decompose.c
D source/blender/nodes/texture/nodes/node_texture_distance.c
D source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
D source/blender/nodes/texture/nodes/node_texture_image.c
D source/blender/nodes/texture/nodes/node_texture_invert.c
D source/blender/nodes/texture/nodes/node_texture_math.c
D source/blender/nodes/texture/nodes/node_texture_mixRgb.c
D source/blender/nodes/texture/nodes/node_texture_output.c
D source/blender/nodes/texture/nodes/node_texture_proc.c
D source/blender/nodes/texture/nodes/node_texture_rotate.c
D source/blender/nodes/texture/nodes/node_texture_scale.c
D source/blender/nodes/texture/nodes/node_texture_texture.c
D source/blender/nodes/texture/nodes/node_texture_translate.c
D source/blender/nodes/texture/nodes/node_texture_valToNor.c
D source/blender/nodes/texture/nodes/node_texture_valToRgb.c
D source/blender/nodes/texture/nodes/node_texture_viewer.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index caf19a9..d2c2d4a 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -185,9 +185,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel):
if tex:
split = layout.split(percentage=0.2)
if tex.use_nodes:
- if slot:
- split.label(text="Output:")
- split.prop(slot, "output_node", text="")
+ pass
else:
split.label(text="Type:")
split.prop(tex, "type", text="")
@@ -218,9 +216,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel):
if tex:
split = layout.split(percentage=0.2)
if tex.use_nodes:
- if slot:
- split.label(text="Output:")
- split.prop(slot, "output_node", text="")
+ pass
else:
split.label(text="Type:")
split.prop(tex, "type", text="")
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 092cd31..ca014f6 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -52,12 +52,6 @@ class ShaderOldNodeCategory(SortedNodeCategory):
not context.scene.render.use_shading_nodes)
-class TextureNodeCategory(SortedNodeCategory):
- @classmethod
- def poll(cls, context):
- return context.space_data.tree_type == 'TextureNodeTree'
-
-
# menu entry for node group tools
def group_tools_draw(self, layout, context):
layout.operator("node.group_make")
@@ -68,11 +62,10 @@ def group_tools_draw(self, layout, context):
node_tree_group_type = {
'CompositorNodeTree': 'CompositorNodeGroup',
'ShaderNodeTree': 'ShaderNodeGroup',
- 'TextureNodeTree': 'TextureNodeGroup',
}
-# generic node group items generator for shader, compositor and texture node groups
+# generic node group items generator for shader and compositor node groups
def node_group_items(context):
if context is None:
return
@@ -403,75 +396,15 @@ compositor_node_categories = [
]),
]
-texture_node_categories = [
- # Texture Nodes
- TextureNodeCategory("TEX_INPUT", "Input", items=[
- NodeItem("TextureNodeCurveTime"),
- NodeItem("TextureNodeCoordinates"),
- NodeItem("TextureNodeTexture"),
- NodeItem("TextureNodeImage"),
- NodeItem("NodeGroupInput", poll=group_input_output_item_poll),
- ]),
- TextureNodeCategory("TEX_OUTPUT", "Output", items=[
- NodeItem("TextureNodeOutput"),
- NodeItem("TextureNodeViewer"),
- NodeItem("NodeGroupOutput", poll=group_input_output_item_poll),
- ]),
- TextureNodeCategory("TEX_OP_COLOR", "Color", items=[
- NodeItem("TextureNodeMixRGB"),
- NodeItem("TextureNodeCurveRGB"),
- NodeItem("TextureNodeInvert"),
- NodeItem("TextureNodeHueSaturation"),
- NodeItem("TextureNodeCompose"),
- NodeItem("TextureNodeDecompose"),
- ]),
- TextureNodeCategory("TEX_PATTERN", "Pattern", items=[
- NodeItem("TextureNodeChecker"),
- NodeItem("TextureNodeBricks"),
- ]),
- TextureNodeCategory("TEX_TEXTURE", "Textures", items=[
- NodeItem("TextureNodeTexNoise"),
- NodeItem("TextureNodeTexDistNoise"),
- NodeItem("TextureNodeTexClouds"),
- NodeItem("TextureNodeTexBlend"),
- NodeItem("TextureNodeTexVoronoi"),
- NodeItem("TextureNodeTexMagic"),
- NodeItem("TextureNodeTexMarble"),
- NodeItem("TextureNodeTexWood"),
- NodeItem("TextureNodeTexMusgrave"),
- NodeItem("TextureNodeTexStucci"),
- ]),
- TextureNodeCategory("TEX_CONVERTOR", "Converter", items=[
- NodeItem("TextureNodeMath"),
- NodeItem("TextureNodeValToRGB"),
- NodeItem("TextureNodeRGBToBW"),
- NodeItem("TextureNodeValToNor"),
- NodeItem("TextureNodeDistance"),
- ]),
- TextureNodeCategory("TEX_DISTORT", "Distort", items=[
- NodeItem("TextureNodeScale"),
- NodeItem("TextureNodeTranslate"),
- NodeItem("TextureNodeRotate"),
- NodeItem("TextureNodeAt"),
- ]),
- TextureNodeCategory("TEX_GROUP", "Group", items=node_group_items),
- TextureNodeCategory("TEX_LAYOUT", "Layout", items=[
- NodeItem("NodeFrame"),
- NodeItem("NodeReroute"),
- ]),
- ]
-
def register():
nodeitems_utils.register_node_categories('SHADER', shader_node_categories)
nodeitems_utils.register_node_categories('COMPOSITING', compositor_node_categories)
- nodeitems_utils.register_node_categories('TEXTURE', texture_node_categories)
def unregister():
nodeitems_utils.unregister_node_categories('SHADER')
nodeitems_utils.unregister_node_categories('COMPOSITING')
- nodeitems_utils.unregister_node_categories('TEXTURE')
if __name__ == "__main__":
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 4ae175f..794649a 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -996,40 +996,7 @@ void ntreeCompositColorBalanceSyncFromCDL(bNodeTree *ntree, bNode *node);
/** \name Texture Nodes
*/
-struct TexResult;
-
-#define TEX_NODE_OUTPUT 401
-#define TEX_NODE_CHECKER 402
-#define TEX_NODE_TEXTURE 403
-#define TEX_NODE_BRICKS 404
-#define TEX_NODE_MATH 405
-#define TEX_NODE_MIX_RGB 406
-#define TEX_NODE_RGBTOBW 407
-#define TEX_NODE_VALTORGB 408
-#define TEX_NODE_IMAGE 409
-#define TEX_NODE_CURVE_RGB 410
-#define TEX_NODE_INVERT 411
-#define TEX_NODE_HUE_SAT 412
-#define TEX_NODE_CURVE_TIME 413
-#define TEX_NODE_ROTATE 414
-#define TEX_NODE_VIEWER 415
-#define TEX_NODE_TRANSLATE 416
-#define TEX_NODE_COORD 417
-#define TEX_NODE_DISTANCE 418
-#define TEX_NODE_COMPOSE 419
-#define TEX_NODE_DECOMPOSE 420
-#define TEX_NODE_VALTONOR 421
-#define TEX_NODE_SCALE 422
-#define TEX_NODE_AT 423
-
-/* 501-599 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
-#define TEX_NODE_PROC 500
-#define TEX_NODE_PROC_MAX 600
-
/* API */
-int ntreeTexTagAnimated(struct bNodeTree *ntree);
-void ntreeTexCheckCyclics(struct bNodeTree *ntree);
-
struct bNodeTreeExec *ntreeTexBeginExecTree(struct bNodeTree *ntree);
void ntreeTexEndExecTree(struct bNodeTreeExec *exec);
/** \} */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index d4551fd..45007b3 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2646,17 +2646,6 @@ void BKE_image_walk_all_users(const Main *mainp, void *customdata,
if (tex->type == TEX_IMAGE && tex->ima) {
callback(tex->ima, &tex->iuser, customdata);
}
-
- if (tex->nodetree) {
- bNode *node;
- for (node = tex->nodetree->nodes.first; node; node = node->next) {
- if (node->id && node->type == TEX_NODE_IMAGE) {
- Image *ima = (Image *)node->id;
- ImageUser *iuser = node->storage;
- callback(ima, iuser, customdata);
- }
- }
- }
}
/* image window, compo node users */
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 75f899d..314ccaf 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3708,56 +3708,6 @@ static void registerShaderNodes(void)
register_node_type_sh_tex_pointdensity();
}
-static void registerTextureNodes(void)
-{
- register_node_type_tex_group();
-
-
- register_node_type_tex_math();
- register_node_type_tex_mix_rgb();
- register_node_type_tex_valtorgb();
- register_node_type_tex_rgbtobw();
- register_node_type_tex_valtonor();
- register_node_type_tex_curve_rgb();
- register_node_type_tex_curve_time();
- register_node_type_tex_invert();
- register_node_type_tex_hue_sat();
- register_node_type_tex_coord();
- register_node_type_tex_distance();
- register_node_type_tex_compose();
- register_node_type_tex_decompose();
-
- register_node_type_tex_output();
- register_node_type_tex_viewer();
- register_node_type_sh_script();
- register_node_type_sh_tangent();
- register_node_type_sh_normal_map();
- register_node_type_sh_hair_info();
-
- register_node_type_tex_checker();
- register_node_type_tex_texture();
- register_node_type_tex_bricks();
- register_node_type_tex_image();
- register_node_type_sh_bsdf_refraction();
- register_node_type_sh_ambient_occlusion();
-
- register_node_type_tex_rotate();
- register_node_type_tex_translate();
- register_node_type_tex_scale();
- register_node_type_tex_at();
-
- register_node_type_tex_proc_voronoi();
- register_node_type_tex_proc_blend();
- register_node_type_tex_proc_magic();
- register_node_type_tex_proc_marble();
- register_node_type_tex_proc_clouds();
- register_node_type_tex_proc_wood();
- register_node_type_tex_proc_musgrave();
- register_node_type_tex_proc_noise();
- register_node_type_tex_proc_stucci();
- register_node_type_tex_proc_distnoise();
-}
-
void init_nodesystem(void)
{
nodetreetypes_hash = BLI_ghash_str_new("nodetreetypes_hash gh");
@@ -3780,7 +3730,6 @@ void init_nodesystem(void)
registerCompositNodes();
registerShaderNodes();
- registerTextureNodes();
}
void free_nodesystem(void)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6b7e961..d2f291c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3035,12 +3035,6 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
else if (ELEM(node->type, CMP_NODE_IMAGE, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER))
((ImageUser *)node->storage)->ok = 1;
}
- else if ( ntree->type==NTREE_TEXTURE) {
- if (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME)
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list