Revision: 56954
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56954
Author: dingto
Date: 2013-05-21 20:21:46 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Shader Nodes:
* Use unified node sizes, as already was done with compositor nodes. Only
Mapping node uses a custom size. This way we don't have too small nodes on
creation anymore.
* Don't show Script Category for Blender Internal nodes.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/nodeitems_builtins.py
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bump.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hair_info.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal_map.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_object_info.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tangent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Modified: trunk/blender/release/scripts/startup/nodeitems_builtins.py
===================================================================
--- trunk/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-21
19:52:22 UTC (rev 56953)
+++ trunk/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-21
20:21:46 UTC (rev 56954)
@@ -117,8 +117,6 @@
NodeItem("ShaderNodeSeparateRGB"),
NodeItem("ShaderNodeCombineRGB"),
]),
- ShaderOldNodeCategory("SH_SCRIPT", "Script", items=[
- ]),
ShaderOldNodeCategory("SH_GROUP", "Group", items=node_group_items),
ShaderOldNodeCategory("SH_LAYOUT", "Layout", items=[
NodeItem("NodeFrame"),
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2013-05-21 19:52:22 UTC
(rev 56953)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2013-05-21 20:21:46 UTC
(rev 56954)
@@ -279,6 +279,7 @@
typedef enum eNodeSizePreset {
NODE_SIZE_DEFAULT,
NODE_SIZE_SMALL,
+ NODE_SIZE_MIDDLE,
NODE_SIZE_LARGE
} eNodeSizePreset;
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2013-05-21
19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2013-05-21
20:21:46 UTC (rev 56954)
@@ -3204,8 +3204,11 @@
case NODE_SIZE_SMALL:
node_type_size(ntype, 100, 80, 320);
break;
+ case NODE_SIZE_MIDDLE:
+ node_type_size(ntype, 150, 120, 320);
+ break;
case NODE_SIZE_LARGE:
- node_type_size(ntype, 140, 120, 500);
+ node_type_size(ntype, 240, 140, 320);
break;
}
}
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -53,7 +53,6 @@
sh_node_type_base(&ntype, SH_NODE_ADD_SHADER, "Add Shader",
NODE_CLASS_SHADER, 0);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_add_shader_in,
sh_node_add_shader_out);
- node_type_size(&ntype, 150, 60, 200);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_add_shader);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
===================================================================
---
trunk/blender/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
2013-05-21 19:52:22 UTC (rev 56953)
+++
trunk/blender/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -52,7 +52,6 @@
sh_node_type_base(&ntype, SH_NODE_AMBIENT_OCCLUSION, "Ambient
Occlusion", NODE_CLASS_SHADER, 0);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_ambient_occlusion_in,
sh_node_ambient_occlusion_out);
- node_type_size(&ntype, 150, 60, 200);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_ambient_occlusion);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -50,7 +50,6 @@
sh_node_type_base(&ntype, SH_NODE_ATTRIBUTE, "Attribute",
NODE_CLASS_INPUT, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, NULL, sh_node_attribute_out);
- node_type_size(&ntype, 150, 60, 200);
node_type_init(&ntype, node_shader_init_attribute);
node_type_storage(&ntype, "NodeShaderAttribute",
node_free_standard_storage, node_copy_standard_storage);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -48,7 +48,6 @@
sh_node_type_base(&ntype, SH_NODE_BACKGROUND, "Background",
NODE_CLASS_SHADER, 0);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_background_in,
sh_node_background_out);
- node_type_size(&ntype, 150, 60, 200);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -55,7 +55,6 @@
sh_node_type_base(&ntype, SH_NODE_BRIGHTCONTRAST, "Bright/Contrast",
NODE_CLASS_OP_COLOR, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_brightcontrast_in,
sh_node_brightcontrast_out);
- node_type_size(&ntype, 140, 100, 320);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, gpu_shader_brightcontrast);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
===================================================================
---
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
2013-05-21 19:52:22 UTC (rev 56953)
+++
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -60,7 +60,7 @@
sh_node_type_base(&ntype, SH_NODE_BSDF_ANISOTROPIC, "Anisotropic BSDF",
NODE_CLASS_SHADER, 0);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_anisotropic_in,
sh_node_bsdf_anisotropic_out);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_bsdf_anisotropic);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -57,7 +57,7 @@
sh_node_type_base(&ntype, SH_NODE_BSDF_DIFFUSE, "Diffuse BSDF",
NODE_CLASS_SHADER, 0);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_diffuse_in,
sh_node_bsdf_diffuse_out);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_bsdf_diffuse);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -58,7 +58,7 @@
sh_node_type_base(&ntype, SH_NODE_BSDF_GLASS, "Glass BSDF",
NODE_CLASS_SHADER, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_glass_in,
sh_node_bsdf_glass_out);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_bsdf_glass);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
2013-05-21 19:52:22 UTC (rev 56953)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -57,7 +57,7 @@
sh_node_type_base(&ntype, SH_NODE_BSDF_GLOSSY, "Glossy BSDF",
NODE_CLASS_SHADER, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_glossy_in,
sh_node_bsdf_glossy_out);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_bsdf_glossy);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
===================================================================
---
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
2013-05-21 19:52:22 UTC (rev 56953)
+++
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
2013-05-21 20:21:46 UTC (rev 56954)
@@ -58,7 +58,7 @@
sh_node_type_base(&ntype, SH_NODE_BSDF_REFRACTION, "Refraction BSDF",
NODE_CLASS_SHADER, NODE_OPTIONS);
node_type_compatibility(&ntype, NODE_NEW_SHADING);
node_type_socket_templates(&ntype, sh_node_bsdf_refraction_in,
sh_node_bsdf_refraction_out);
- node_type_size(&ntype, 150, 60, 200);
+ node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);
node_type_gpu(&ntype, node_shader_gpu_bsdf_refraction);
Modified:
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
===================================================================
---
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
2013-05-21 19:52:22 UTC (rev 56953)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
