Revision: 56964
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56964
Author: dingto
Date: 2013-05-22 17:24:52 +0000 (Wed, 22 May 2013)
Log Message:
-----------
Texture Nodes:
* Use node size presets as well, some nodes were too small and also too limited
in max size.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_translate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_viewer.c
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -127,7 +127,7 @@
tex_node_type_base(&ntype, TEX_NODE_BRICKS, "Bricks",
NODE_CLASS_PATTERN, NODE_PREVIEW|NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 150, 60, 150);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, init);
node_type_exec(&ntype, NULL, NULL, exec);
Modified:
trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -76,7 +76,6 @@
tex_node_type_base(&ntype, TEX_NODE_CHECKER, "Checker",
NODE_CLASS_PATTERN, NODE_PREVIEW|NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 100, 60, 150);
node_type_exec(&ntype, NULL, NULL, exec);
nodeRegisterType(&ntype);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_common.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -166,7 +166,6 @@
RNA_struct_blender_type_set(ntype.ext.srna, &ntype);
node_type_socket_templates(&ntype, NULL, NULL);
- node_type_size(&ntype, 120, 60, 200);
node_type_label(&ntype, node_group_label);
node_type_update(&ntype, NULL, node_group_verify);
node_type_exec(&ntype, group_initexec, group_freeexec, group_execute);
Modified:
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -63,7 +63,6 @@
tex_node_type_base(&ntype, TEX_NODE_COMPOSE, "Combine RGBA",
NODE_CLASS_OP_COLOR, 0);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 100, 60, 150);
node_type_exec(&ntype, NULL, NULL, exec);
nodeRegisterType(&ntype);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -54,7 +54,6 @@
tex_node_type_base(&ntype, TEX_NODE_COORD, "Coordinates",
NODE_CLASS_INPUT, NODE_OPTIONS);
node_type_socket_templates(&ntype, NULL, outputs);
- node_type_size(&ntype, 120, 110, 160);
node_type_storage(&ntype, "node_coord", NULL, NULL);
node_type_exec(&ntype, NULL, NULL, exec);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -73,7 +73,7 @@
tex_node_type_base(&ntype, TEX_NODE_CURVE_TIME, "Time",
NODE_CLASS_INPUT, NODE_OPTIONS);
node_type_socket_templates(&ntype, NULL, time_outputs);
- node_type_size(&ntype, 140, 100, 320);
+ node_type_size_preset(&ntype, NODE_SIZE_LARGE);
node_type_init(&ntype, time_init);
node_type_storage(&ntype, "CurveMapping", node_free_curves,
node_copy_curves);
node_type_exec(&ntype, node_initexec_curves, NULL, time_exec);
@@ -117,7 +117,7 @@
tex_node_type_base(&ntype, TEX_NODE_CURVE_RGB, "RGB Curves",
NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, rgb_inputs, rgb_outputs);
- node_type_size(&ntype, 200, 140, 320);
+ node_type_size_preset(&ntype, NODE_SIZE_LARGE);
node_type_init(&ntype, rgb_init);
node_type_storage(&ntype, "CurveMapping", node_free_curves,
node_copy_curves);
node_type_exec(&ntype, node_initexec_curves, NULL, rgb_exec);
Modified:
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -84,7 +84,6 @@
tex_node_type_base(&ntype, TEX_NODE_DECOMPOSE, "Separate RGBA",
NODE_CLASS_OP_COLOR, 0);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 100, 60, 150);
node_type_exec(&ntype, NULL, NULL, exec);
nodeRegisterType(&ntype);
Modified:
trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -67,7 +67,6 @@
tex_node_type_base(&ntype, TEX_NODE_DISTANCE, "Distance",
NODE_CLASS_CONVERTOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 120, 110, 160);
node_type_storage(&ntype, "node_distance", NULL, NULL);
node_type_exec(&ntype, NULL, NULL, exec);
Modified:
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -98,7 +98,7 @@
tex_node_type_base(&ntype, TEX_NODE_HUE_SAT, "Hue Saturation Value",
NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 150, 80, 250);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_exec(&ntype, NULL, NULL, exec);
nodeRegisterType(&ntype);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -103,7 +103,6 @@
tex_node_type_base(&ntype, TEX_NODE_IMAGE, "Image", NODE_CLASS_INPUT,
NODE_PREVIEW|NODE_OPTIONS);
node_type_socket_templates(&ntype, NULL, outputs);
- node_type_size(&ntype, 120, 80, 300);
node_type_init(&ntype, init);
node_type_storage(&ntype, "ImageUser", node_free_standard_storage,
node_copy_standard_storage);
node_type_exec(&ntype, NULL, NULL, exec);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -69,7 +69,6 @@
tex_node_type_base(&ntype, TEX_NODE_INVERT, "Invert",
NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 90, 80, 100);
node_type_exec(&ntype, NULL, NULL, exec);
nodeRegisterType(&ntype);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -201,7 +201,6 @@
tex_node_type_base(&ntype, TEX_NODE_MATH, "Math", NODE_CLASS_CONVERTOR,
NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 120, 110, 160);
node_type_label(&ntype, node_math_label);
node_type_storage(&ntype, "node_math", NULL, NULL);
node_type_exec(&ntype, NULL, NULL, exec);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -74,7 +74,6 @@
tex_node_type_base(&ntype, TEX_NODE_MIX_RGB, "Mix",
NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, outputs);
- node_type_size(&ntype, 100, 60, 150);
node_type_label(&ntype, node_blend_label);
node_type_exec(&ntype, NULL, NULL, exec);
Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
2013-05-22 13:20:20 UTC (rev 56963)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
2013-05-22 17:24:52 UTC (rev 56964)
@@ -164,7 +164,7 @@
tex_node_type_base(&ntype, TEX_NODE_OUTPUT, "Output",
NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS);
node_type_socket_templates(&ntype, inputs, NULL);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, init);
node_type_storage(&ntype, "TexNodeOutput", node_free_standard_storage,
copy);
node_type_exec(&ntype, NULL, NULL, exec);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
