[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47066] trunk/blender: style cleanup: nodes, also rename chunksize -> chunk_size
Campbell Barton
ideasman42 at gmail.com
Sun May 27 13:08:47 CEST 2012
Revision: 47066
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47066
Author: campbellbarton
Date: 2012-05-27 11:08:47 +0000 (Sun, 27 May 2012)
Log Message:
-----------
style cleanup: nodes, also rename chunksize -> chunk_size
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py 2012-05-27 10:35:12 UTC (rev 47065)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py 2012-05-27 11:08:47 UTC (rev 47066)
@@ -222,7 +222,7 @@
layout.prop(tree, "render_quality", text="Render")
layout.prop(tree, "edit_quality", text="Edit")
- layout.prop(tree, "chunksize")
+ layout.prop(tree, "chunk_size")
layout.prop(tree, "use_opencl")
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-27 10:35:12 UTC (rev 47065)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-27 11:08:47 UTC (rev 47066)
@@ -58,9 +58,9 @@
#include "MEM_guardedalloc.h"
EnumPropertyItem nodetree_type_items[] = {
- {NTREE_SHADER, "SHADER", ICON_MATERIAL, "Shader", "Shader nodes" },
- {NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes" },
- {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes" },
+ {NTREE_SHADER, "SHADER", ICON_MATERIAL, "Shader", "Shader nodes"},
+ {NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes"},
+ {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes"},
{0, NULL, 0, NULL, NULL}
};
@@ -68,7 +68,8 @@
{NTREE_QUALITY_HIGH, "HIGH", 0, "High", "High quality"},
{NTREE_QUALITY_MEDIUM, "MEDIUM", 0, "Medium", "Medium quality"},
{NTREE_QUALITY_LOW, "LOW", 0, "Low", "Low quality"},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem node_socket_type_items[] = {
{SOCK_FLOAT, "VALUE", 0, "Value", ""},
@@ -78,7 +79,8 @@
{SOCK_BOOLEAN, "BOOLEAN", 0, "Boolean", ""},
{SOCK_MESH, "MESH", 0, "Mesh", ""},
{SOCK_INT, "INT", 0, "Int", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem node_math_items[] = {
{ 0, "ADD", 0, "Add", ""},
@@ -98,7 +100,8 @@
{14, "ROUND", 0, "Round", ""},
{15, "LESS_THAN", 0, "Less Than", ""},
{16, "GREATER_THAN", 0, "Greater Than", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem node_vec_math_items[] = {
{0, "ADD", 0, "Add", ""},
@@ -107,7 +110,8 @@
{3, "DOT_PRODUCT", 0, "Dot Product", ""},
{4, "CROSS_PRODUCT", 0, "Cross Product", ""},
{5, "NORMALIZE", 0, "Normalize", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem node_filter_items[] = {
{0, "SOFTEN", 0, "Soften", ""},
@@ -117,7 +121,8 @@
{4, "PREWITT", 0, "Prewitt", ""},
{5, "KIRSCH", 0, "Kirsch", ""},
{6, "SHADOW", 0, "Shadow", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem prop_noise_basis_items[] = {
{SHD_NOISE_PERLIN, "PERLIN", 0, "Perlin", ""},
@@ -128,19 +133,22 @@
{SHD_NOISE_VORONOI_F2_F1, "VORONOI_F2_F1", 0, "Voronoi F2-F1", ""},
{SHD_NOISE_VORONOI_CRACKLE, "VORONOI_CRACKLE", 0, "Voronoi Crackle", ""},
{SHD_NOISE_CELL_NOISE, "CELL_NOISE", 0, "Cell Noise", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
EnumPropertyItem prop_noise_type_items[] = {
{SHD_NOISE_SOFT, "SOFT", 0, "Soft", ""},
{SHD_NOISE_HARD, "HARD", 0, "Hard", ""},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
#if 0
EnumPropertyItem prop_wave_items[] = {
{SHD_WAVE_SINE, "SINE", 0, "Sine", "Use a sine wave to produce bands"},
{SHD_WAVE_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"},
{SHD_WAVE_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"},
- {0, NULL, 0, NULL, NULL}};
+ {0, NULL, 0, NULL, NULL}
+};
#endif
/* Add any new socket value subtype here.
@@ -151,31 +159,31 @@
* before using this macro, and undefined afterwards.
*/
#define NODE_DEFINE_SUBTYPES_INT \
-SUBTYPE(INT, Int, NONE, None) \
-SUBTYPE(INT, Int, UNSIGNED, Unsigned)
+ SUBTYPE(INT, Int, NONE, None) \
+ SUBTYPE(INT, Int, UNSIGNED, Unsigned)
#define NODE_DEFINE_SUBTYPES_FLOAT \
-SUBTYPE(FLOAT, Float, NONE, None) \
-SUBTYPE(FLOAT, Float, UNSIGNED, Unsigned) \
-SUBTYPE(FLOAT, Float, PERCENTAGE, Percentage) \
-SUBTYPE(FLOAT, Float, FACTOR, Factor) \
-SUBTYPE(FLOAT, Float, ANGLE, Angle) \
-SUBTYPE(FLOAT, Float, TIME, Time) \
-SUBTYPE(FLOAT, Float, DISTANCE, Distance)
+ SUBTYPE(FLOAT, Float, NONE, None) \
+ SUBTYPE(FLOAT, Float, UNSIGNED, Unsigned) \
+ SUBTYPE(FLOAT, Float, PERCENTAGE, Percentage) \
+ SUBTYPE(FLOAT, Float, FACTOR, Factor) \
+ SUBTYPE(FLOAT, Float, ANGLE, Angle) \
+ SUBTYPE(FLOAT, Float, TIME, Time) \
+ SUBTYPE(FLOAT, Float, DISTANCE, Distance)
#define NODE_DEFINE_SUBTYPES_VECTOR \
-SUBTYPE(VECTOR, Vector, NONE, None) \
-SUBTYPE(VECTOR, Vector, TRANSLATION, Translation) \
-SUBTYPE(VECTOR, Vector, DIRECTION, Direction) \
-SUBTYPE(VECTOR, Vector, VELOCITY, Velocity) \
-SUBTYPE(VECTOR, Vector, ACCELERATION, Acceleration) \
-SUBTYPE(VECTOR, Vector, EULER, Euler) \
-SUBTYPE(VECTOR, Vector, XYZ, XYZ)
+ SUBTYPE(VECTOR, Vector, NONE, None) \
+ SUBTYPE(VECTOR, Vector, TRANSLATION, Translation) \
+ SUBTYPE(VECTOR, Vector, DIRECTION, Direction) \
+ SUBTYPE(VECTOR, Vector, VELOCITY, Velocity) \
+ SUBTYPE(VECTOR, Vector, ACCELERATION, Acceleration) \
+ SUBTYPE(VECTOR, Vector, EULER, Euler) \
+ SUBTYPE(VECTOR, Vector, XYZ, XYZ)
#define NODE_DEFINE_SUBTYPES \
-NODE_DEFINE_SUBTYPES_INT \
-NODE_DEFINE_SUBTYPES_FLOAT \
-NODE_DEFINE_SUBTYPES_VECTOR
+ NODE_DEFINE_SUBTYPES_INT \
+ NODE_DEFINE_SUBTYPES_FLOAT \
+ NODE_DEFINE_SUBTYPES_VECTOR
#ifdef RNA_RUNTIME
@@ -190,7 +198,7 @@
static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
switch (node->type) {
@@ -215,7 +223,7 @@
static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr)
{
- bNodeTree *ntree = (bNodeTree*)ptr->data;
+ bNodeTree *ntree = (bNodeTree *)ptr->data;
switch (ntree->type) {
case NTREE_SHADER:
@@ -231,14 +239,14 @@
static char *rna_Node_path(PointerRNA *ptr)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
return BLI_sprintfN("nodes[\"%s\"]", node->name);
}
static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
{
- bNodeSocket *sock = (bNodeSocket*)ptr->data;
+ bNodeSocket *sock = (bNodeSocket *)ptr->data;
if (sock->default_value) {
/* This returns the refined socket type with the full definition
@@ -247,27 +255,27 @@
#define SUBTYPE(socktype, stypename, id, idname) \
{ \
- bNodeSocketValue##stypename *value = (bNodeSocketValue##stypename*)sock->default_value; \
+ bNodeSocketValue##stypename * value = (bNodeSocketValue##stypename *)sock->default_value; \
if (value->subtype == PROP_##id) \
return &RNA_NodeSocket##stypename##idname; \
}
switch (sock->type) {
- case SOCK_FLOAT:
- NODE_DEFINE_SUBTYPES_FLOAT
- break;
- case SOCK_INT:
- NODE_DEFINE_SUBTYPES_INT
- break;
- case SOCK_BOOLEAN:
- return &RNA_NodeSocketBoolean;
- case SOCK_VECTOR:
- NODE_DEFINE_SUBTYPES_VECTOR
- break;
- case SOCK_RGBA:
- return &RNA_NodeSocketRGBA;
- case SOCK_SHADER:
- return &RNA_NodeSocketShader;
+ case SOCK_FLOAT:
+ NODE_DEFINE_SUBTYPES_FLOAT
+ break;
+ case SOCK_INT:
+ NODE_DEFINE_SUBTYPES_INT
+ break;
+ case SOCK_BOOLEAN:
+ return &RNA_NodeSocketBoolean;
+ case SOCK_VECTOR:
+ NODE_DEFINE_SUBTYPES_VECTOR
+ break;
+ case SOCK_RGBA:
+ return &RNA_NodeSocketRGBA;
+ case SOCK_SHADER:
+ return &RNA_NodeSocketShader;
}
#undef SUBTYPE
@@ -278,8 +286,8 @@
static char *rna_NodeSocket_path(PointerRNA *ptr)
{
- bNodeTree *ntree = (bNodeTree*)ptr->id.data;
- bNodeSocket *sock = (bNodeSocket*)ptr->data;
+ bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+ bNodeSocket *sock = (bNodeSocket *)ptr->data;
bNode *node;
int socketindex;
@@ -309,7 +317,7 @@
/* Button Set Funcs for Matte Nodes */
static void rna_Matte_t1_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
chroma->t1 = value;
@@ -320,7 +328,7 @@
static void rna_Matte_t2_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
if (value > chroma->t1)
@@ -331,7 +339,7 @@
static void rna_distance_matte_t1_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
chroma->t1 = value;
@@ -339,7 +347,7 @@
static void rna_distance_matte_t2_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
chroma->t2 = value;
@@ -347,7 +355,7 @@
static void rna_difference_matte_t1_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
chroma->t1 = value;
@@ -355,7 +363,7 @@
static void rna_difference_matte_t2_set(PointerRNA *ptr, float value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
NodeChroma *chroma = node->storage;
chroma->t2 = value;
@@ -364,7 +372,7 @@
static void rna_Node_scene_set(PointerRNA *ptr, PointerRNA value)
{
- bNode *node = (bNode*)ptr->data;
+ bNode *node = (bNode *)ptr->data;
if (node->id) {
id_us_min(node->id);
@@ -385,16 +393,16 @@
static void rna_Node_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- bNodeTree *ntree = (bNodeTree*)ptr->id.data;
- bNode *node = (bNode*)ptr->data;
+ bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+ bNode *node = (bNode *)ptr->data;
node_update(bmain, scene, ntree, node);
}
static void rna_Node_tex_image_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
- bNodeTree *ntree = (bNodeTree*)ptr->id.data;
- bNode *node = (bNode*)ptr->data;
+ bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+ bNode *node = (bNode *)ptr->data;
node_update(bmain, scene, ntree, node);
WM_main_add_notifier(NC_IMAGE, NULL);
@@ -402,8 +410,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list