Commit: 5e2cc06518e9d32a625cfd3fce4987c705155bed
Author: Mike Erwin
Date: Wed Mar 25 14:28:36 2015 -0400
Branches: master
https://developer.blender.org/rB5e2cc06518e9d32a625cfd3fce4987c705155bed
minor cleanup: alignment
===================================================================
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/shader/nodes/node_shader_object_info.c
===================================================================
diff --git a/source/blender/nodes/NOD_static_types.h
b/source/blender/nodes/NOD_static_types.h
index 166fa29..6b9a97c 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -71,7 +71,7 @@ DefNode( ShaderNode, SH_NODE_OUTPUT_LAMP,
def_sh_output, "OU
DefNode( ShaderNode, SH_NODE_OUTPUT_WORLD, def_sh_output,
"OUTPUT_WORLD", OutputWorld, "World Output", "" )
DefNode( ShaderNode, SH_NODE_OUTPUT_LINESTYLE,
def_sh_output_linestyle,"OUTPUT_LINESTYLE", OutputLineStyle, "Line Style
Output", "" )
DefNode( ShaderNode, SH_NODE_FRESNEL, 0,
"FRESNEL", Fresnel, "Fresnel", "" )
-DefNode( ShaderNode, SH_NODE_LAYER_WEIGHT, 0,
"LAYER_WEIGHT", LayerWeight, "Layer Weight", "" )
+DefNode( ShaderNode, SH_NODE_LAYER_WEIGHT, 0,
"LAYER_WEIGHT", LayerWeight, "Layer Weight", "" )
DefNode( ShaderNode, SH_NODE_MIX_SHADER, 0,
"MIX_SHADER", MixShader, "Mix Shader", "" )
DefNode( ShaderNode, SH_NODE_ADD_SHADER, 0,
"ADD_SHADER", AddShader, "Add Shader", "" )
DefNode( ShaderNode, SH_NODE_ATTRIBUTE, def_sh_attribute,
"ATTRIBUTE", Attribute, "Attribute", "" )
@@ -208,7 +208,7 @@ DefNode( CompositorNode, CMP_NODE_KEYINGSCREEN,
def_cmp_keyingscreen, "KEYIN
DefNode( CompositorNode, CMP_NODE_KEYING, def_cmp_keying,
"KEYING", Keying, "Keying", "" )
DefNode( CompositorNode, CMP_NODE_TRACKPOS, def_cmp_trackpos,
"TRACKPOS", TrackPos, "Track Position", "" )
DefNode( CompositorNode, CMP_NODE_PIXELATE, 0,
"PIXELATE", Pixelate, "Pixelate", "" )
-DefNode( CompositorNode,
CMP_NODE_PLANETRACKDEFORM,def_cmp_planetrackdeform,"PLANETRACKDEFORM",PlaneTrackDeform,"Plane
Track Deform","" )
+DefNode( CompositorNode,
CMP_NODE_PLANETRACKDEFORM,def_cmp_planetrackdeform,"PLANETRACKDEFORM",PlaneTrackDeform,"Plane
Track Deform","" )
DefNode( CompositorNode, CMP_NODE_CORNERPIN, 0,
"CORNERPIN", CornerPin, "Corner Pin", "" )
DefNode( CompositorNode, CMP_NODE_SUNBEAMS, def_cmp_sunbeams,
"SUNBEAMS", SunBeams, "Sun Beams", "" )
diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.c
b/source/blender/nodes/shader/nodes/node_shader_object_info.c
index a862c62..d190524 100644
--- a/source/blender/nodes/shader/nodes/node_shader_object_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_object_info.c
@@ -30,10 +30,10 @@
/* **************** OUTPUT ******************** */
static bNodeSocketTemplate sh_node_object_info_out[] = {
- { SOCK_VECTOR, 0, N_("Location"), 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_FLOAT, 0, N_("Object Index"), 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_FLOAT, 0, N_("Material Index"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
- { SOCK_FLOAT, 0, N_("Random"), 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_VECTOR, 0, N_("Location"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_FLOAT, 0, N_("Object Index"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_FLOAT, 0, N_("Material Index"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_FLOAT, 0, N_("Random"), 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0, "" }
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
