diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 310 |
1 files changed, 155 insertions, 155 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 01131709f3b..07d52f1a8ba 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -187,7 +187,7 @@ static StructRNA *rna_Node_refine(struct PointerRNA *ptr) { bNode *node = (bNode*)ptr->data; - switch(node->type) { + switch (node->type) { #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \ case ID: return &RNA_##Category##StructName; @@ -208,9 +208,9 @@ static StructRNA *rna_Node_refine(struct PointerRNA *ptr) static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr) { - bNodeTree *ntree= (bNodeTree*)ptr->data; + bNodeTree *ntree = (bNodeTree*)ptr->data; - switch(ntree->type) { + switch (ntree->type) { case NTREE_SHADER: return &RNA_ShaderNodeTree; case NTREE_COMPOSIT: @@ -224,14 +224,14 @@ static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr) 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 @@ -240,8 +240,8 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr) #define SUBTYPE(socktype, stypename, id, idname) \ { \ - bNodeSocketValue##stypename *value= (bNodeSocketValue##stypename*)sock->default_value; \ - if (value->subtype==PROP_##id) \ + bNodeSocketValue##stypename *value = (bNodeSocketValue##stypename*)sock->default_value; \ + if (value->subtype == PROP_##id) \ return &RNA_NodeSocket##stypename##idname; \ } @@ -277,8 +277,8 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr) 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; @@ -308,21 +308,21 @@ static char *rna_NodeSocket_path(PointerRNA *ptr) /* 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; - if(value < chroma->t2) + if (value < chroma->t2) chroma->t2 = value; } 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) + if (value > chroma->t1) value = chroma->t1; chroma->t2 = value; @@ -330,14 +330,14 @@ static void rna_Matte_t2_set(PointerRNA *ptr, float value) 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); - node->id= NULL; + node->id = NULL; } - node->id= value.data; + node->id = value.data; id_us_plus(node->id); } @@ -351,16 +351,16 @@ static void node_update(Main *bmain, Scene *UNUSED(scene), bNodeTree *ntree, bNo 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_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); @@ -368,10 +368,10 @@ static void rna_Node_image_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_Node_material_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; - if(node->id) + if (node->id) nodeSetActive(ntree, node); node_update(bmain, scene, ntree, node); @@ -379,8 +379,8 @@ static void rna_Node_material_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_NodeGroup_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; ntreeUpdateTree((bNodeTree *)node->id); @@ -389,8 +389,8 @@ static void rna_NodeGroup_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_Node_name_set(PointerRNA *ptr, const char *value) { - bNodeTree *ntree= (bNodeTree*)ptr->id.data; - bNode *node= (bNode*)ptr->data; + bNodeTree *ntree = (bNodeTree*)ptr->id.data; + bNode *node = (bNode*)ptr->data; char oldname[sizeof(node->name)]; /* make a copy of the old name first */ @@ -406,8 +406,8 @@ static void rna_Node_name_set(PointerRNA *ptr, const char *value) static void rna_NodeSocket_update(Main *bmain, Scene *scene, 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; if (nodeFindNode(ntree, sock, &node, NULL, NULL)) @@ -416,8 +416,8 @@ static void rna_NodeSocket_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_NodeGroupSocket_update(Main *bmain, Scene *scene, 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; ntreeUpdateTree(ntree); @@ -429,7 +429,7 @@ static void rna_NodeGroupSocket_update(Main *bmain, Scene *scene, PointerRNA *pt #if 0 /* UNUSED */ static void rna_NodeLink_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - bNodeTree *ntree= (bNodeTree*)ptr->id.data; + bNodeTree *ntree = (bNodeTree*)ptr->id.data; ntree->update |= NTREE_UPDATE_LINKS; ntreeUpdateTree(ntree); @@ -438,33 +438,33 @@ static void rna_NodeLink_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_NodeSocketInt_range(PointerRNA *ptr, int *min, int *max) { - bNodeSocket *sock= (bNodeSocket*)ptr->data; - bNodeSocketValueInt *val= (bNodeSocketValueInt*)sock->default_value; + bNodeSocket *sock = (bNodeSocket*)ptr->data; + bNodeSocketValueInt *val = (bNodeSocketValueInt*)sock->default_value; *min = val->min; *max = val->max; } static void rna_NodeSocketFloat_range(PointerRNA *ptr, float *min, float *max) { - bNodeSocket *sock= (bNodeSocket*)ptr->data; - bNodeSocketValueFloat *val= (bNodeSocketValueFloat*)sock->default_value; + bNodeSocket *sock = (bNodeSocket*)ptr->data; + bNodeSocketValueFloat *val = (bNodeSocketValueFloat*)sock->default_value; *min = val->min; *max = val->max; } static void rna_NodeSocketVector_range(PointerRNA *ptr, float *min, float *max) { - bNodeSocket *sock= (bNodeSocket*)ptr->data; - bNodeSocketValueVector *val= (bNodeSocketValueVector*)sock->default_value; + bNodeSocket *sock = (bNodeSocket*)ptr->data; + bNodeSocketValueVector *val = (bNodeSocketValueVector*)sock->default_value; *min = val->min; *max = val->max; } static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - bNode *node= (bNode*)ptr->data; + bNode *node = (bNode*)ptr->data; Image *ima = (Image *)node->id; - ImageUser *iuser= node->storage; + ImageUser *iuser = node->storage; BKE_image_multilayer_index(ima->rr, iuser); BKE_image_signal(ima, iuser, IMA_SIGNAL_SRC_CHANGE); @@ -474,16 +474,16 @@ static void rna_Node_image_layer_update(Main *bmain, Scene *scene, PointerRNA *p static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl) { - EnumPropertyItem *item= NULL; + EnumPropertyItem *item = NULL; EnumPropertyItem tmp = {0, "", 0, "", ""}; - int i=0, totitem=0; + int i = 0, totitem = 0; while (rl) { tmp.identifier = rl->name; - tmp.name= rl->name; + tmp.name = rl->name; tmp.value = i++; RNA_enum_item_add(&item, &totitem, &tmp); - rl=rl->next; + rl = rl->next; } RNA_enum_item_end(&item, &totitem); @@ -493,9 +493,9 @@ static EnumPropertyItem *renderresult_layers_add_enum(RenderLayer *rl) static EnumPropertyItem *rna_Node_image_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { - bNode *node= (bNode*)ptr->data; + bNode *node = (bNode*)ptr->data; Image *ima = (Image *)node->id; - EnumPropertyItem *item= NULL; + EnumPropertyItem *item = NULL; RenderLayer *rl; if (!ima || !(ima->rr)) return NULL; @@ -503,16 +503,16 @@ static EnumPropertyItem *rna_Node_image_layer_itemf(bContext *UNUSED(C), Pointer rl = ima->rr->layers.first; item = renderresult_layers_add_enum(rl); - *free= 1; + *free = 1; return item; } static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { - bNode *node= (bNode*)ptr->data; + bNode *node = (bNode*)ptr->data; Scene *sce = (Scene *)node->id; - EnumPropertyItem *item= NULL; + EnumPropertyItem *item = NULL; RenderLayer *rl; if (!sce) return NULL; @@ -520,49 +520,49 @@ static EnumPropertyItem *rna_Node_scene_layer_itemf(bContext *UNUSED(C), Pointer rl = sce->r.layers.first; item = renderresult_layers_add_enum(rl); - *free= 1; + *free = 1; return item; } static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { - bNode *node= (bNode*)ptr->data; - EnumPropertyItem *item= NULL; + bNode *node = (bNode*)ptr->data; + EnumPropertyItem *item = NULL; EnumPropertyItem tmp = {0, "", 0, "", ""}; - int totitem=0; + int totitem = 0; - switch(node->custom1) { + switch (node->custom1) { case CMP_NODE_CHANNEL_MATTE_CS_RGB: - tmp.identifier= "R"; tmp.name= "R"; tmp.value= 1; + tmp.identifier = "R"; tmp.name = "R"; tmp.value = 1; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "G"; tmp.name= "G"; tmp.value= 2; + tmp.identifier = "G"; tmp.name = "G"; tmp.value = 2; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "B"; tmp.name= "B"; tmp.value= 3; + tmp.identifier = "B"; tmp.name = "B"; tmp.value = 3; RNA_enum_item_add(&item, &totitem, &tmp); break; case CMP_NODE_CHANNEL_MATTE_CS_HSV: - tmp.identifier= "H"; tmp.name= "H"; tmp.value= 1; + tmp.identifier = "H"; tmp.name = "H"; tmp.value = 1; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "S"; tmp.name= "S"; tmp.value= 2; + tmp.identifier = "S"; tmp.name = "S"; tmp.value = 2; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "V"; tmp.name= "V"; tmp.value= 3; + tmp.identifier = "V"; tmp.name = "V"; tmp.value = 3; RNA_enum_item_add(&item, &totitem, &tmp); break; case CMP_NODE_CHANNEL_MATTE_CS_YUV: - tmp.identifier= "Y"; tmp.name= "Y"; tmp.value= 1; + tmp.identifier = "Y"; tmp.name = "Y"; tmp.value = 1; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "G"; tmp.name= "U"; tmp.value= 2; + tmp.identifier = "G"; tmp.name = "U"; tmp.value = 2; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "V"; tmp.name= "V"; tmp.value= 3; + tmp.identifier = "V"; tmp.name = "V"; tmp.value = 3; RNA_enum_item_add(&item, &totitem, &tmp); break; case CMP_NODE_CHANNEL_MATTE_CS_YCC: - tmp.identifier= "Y"; tmp.name= "Y"; tmp.value= 1; + tmp.identifier = "Y"; tmp.name = "Y"; tmp.value = 1; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "CB"; tmp.name= "Cr"; tmp.value= 2; + tmp.identifier = "CB"; tmp.name = "Cr"; tmp.value = 2; RNA_enum_item_add(&item, &totitem, &tmp); - tmp.identifier= "CR"; tmp.name= "Cb"; tmp.value= 3; + tmp.identifier = "CR"; tmp.name = "Cb"; tmp.value = 3; RNA_enum_item_add(&item, &totitem, &tmp); break; default: @@ -570,7 +570,7 @@ static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA } RNA_enum_item_end(&item, &totitem); - *free= 1; + *free = 1; return item; } @@ -607,18 +607,18 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *UNUSED(C), Repor static bNode *rna_NodeTree_node_composite_new(bNodeTree *ntree, bContext *C, ReportList *reports, int type, bNodeTree *group) { /* raises error on failure */ - bNode *node= rna_NodeTree_node_new(ntree, C, reports, type, group); + bNode *node = rna_NodeTree_node_new(ntree, C, reports, type, group); if (node) { - if(ELEM4(node->type, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE, CMP_NODE_R_LAYERS)) { + if (ELEM4(node->type, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE, CMP_NODE_R_LAYERS)) { /* annoying, find the node tree we are in, scene can be NULL */ Scene *scene; - for(scene= CTX_data_main(C)->scene.first; scene; scene= scene->id.next) { - if(scene->nodetree == ntree) { + for (scene = CTX_data_main(C)->scene.first; scene; scene = scene->id.next) { + if (scene->nodetree == ntree) { break; } } - node->id= (ID *)scene; + node->id = (ID *)scene; id_us_plus(node->id); } @@ -632,7 +632,7 @@ static bNode *rna_NodeTree_node_composite_new(bNodeTree *ntree, bContext *C, Rep static bNode *rna_NodeTree_node_texture_new(bNodeTree *ntree, bContext *C, ReportList *reports, int type, bNodeTree *group) { /* raises error on failure */ - bNode *node= rna_NodeTree_node_new(ntree, C, reports, type, group); + bNode *node = rna_NodeTree_node_new(ntree, C, reports, type, group); if (node) { ntreeTexCheckCyclics(ntree); @@ -659,17 +659,17 @@ static void rna_NodeTree_node_remove(bNodeTree *ntree, ReportList *reports, bNod static void rna_NodeTree_node_clear(bNodeTree *ntree) { - bNode *node= ntree->nodes.first; + bNode *node = ntree->nodes.first; - while(node) { - bNode *next_node= node->next; + while (node) { + bNode *next_node = node->next; if (node->id) id_us_min(node->id); nodeFreeNode(ntree, node); - node= next_node; + node = next_node; } ntreeUpdateTree(ntree); /* update group node socket links*/ @@ -680,7 +680,7 @@ static void rna_NodeTree_node_clear(bNodeTree *ntree) static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports, bNodeSocket *in, bNodeSocket *out) { bNodeLink *ret; - bNode *fromnode= NULL, *tonode= NULL; + bNode *fromnode = NULL, *tonode = NULL; int from_in_out, to_in_out; nodeFindNode(ntree, in, &fromnode, NULL, &from_in_out); @@ -694,9 +694,9 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports, b /* unlink node input socket */ nodeRemSocketLinks(ntree, out); - ret= nodeAddLink(ntree, fromnode, in, tonode, out); + ret = nodeAddLink(ntree, fromnode, in, tonode, out); - if(ret) { + if (ret) { nodeUpdate(ntree, tonode); ntreeUpdateTree(ntree); @@ -721,14 +721,14 @@ static void rna_NodeTree_link_remove(bNodeTree *ntree, ReportList *reports, bNod static void rna_NodeTree_link_clear(bNodeTree *ntree) { - bNodeLink *link= ntree->links.first; + bNodeLink *link = ntree->links.first; - while(link) { - bNodeLink *next_link= link->next; + while (link) { + bNodeLink *next_link = link->next; nodeRemLink(ntree, link); - link= next_link; + link = next_link; } ntreeUpdateTree(ntree); @@ -738,7 +738,7 @@ static void rna_NodeTree_link_clear(bNodeTree *ntree) static bNodeSocket *rna_NodeTree_input_new(bNodeTree *ntree, ReportList *UNUSED(reports), const char *name, int type) { /* XXX should check if tree is a group here! no good way to do this currently. */ - bNodeSocket *gsock= node_group_add_socket(ntree, name, type, SOCK_IN); + bNodeSocket *gsock = node_group_add_socket(ntree, name, type, SOCK_IN); ntree->update |= NTREE_UPDATE_GROUP_IN; ntreeUpdateTree(ntree); @@ -749,7 +749,7 @@ static bNodeSocket *rna_NodeTree_input_new(bNodeTree *ntree, ReportList *UNUSED( static bNodeSocket *rna_NodeTree_output_new(bNodeTree *ntree, ReportList *UNUSED(reports), const char *name, int type) { /* XXX should check if tree is a group here! no good way to do this currently. */ - bNodeSocket *gsock= node_group_add_socket(ntree, name, type, SOCK_OUT); + bNodeSocket *gsock = node_group_add_socket(ntree, name, type, SOCK_OUT); ntree->update |= NTREE_UPDATE_GROUP_OUT; ntreeUpdateTree(ntree); @@ -765,7 +765,7 @@ static bNodeSocket *rna_NodeTree_input_expose(bNodeTree *ntree, ReportList *repo if (!nodeFindNode(ntree, sock, &node, &index, &in_out)) BKE_reportf(reports, RPT_ERROR, "Unable to locate socket in nodetree"); - else if (in_out!=SOCK_IN) + else if (in_out != SOCK_IN) BKE_reportf(reports, RPT_ERROR, "Socket is not an input"); else { /* XXX should check if tree is a group here! no good way to do this currently. */ @@ -789,7 +789,7 @@ static bNodeSocket *rna_NodeTree_output_expose(bNodeTree *ntree, ReportList *rep if (!nodeFindNode(ntree, sock, &node, &index, &in_out)) BKE_reportf(reports, RPT_ERROR, "Unable to locate socket in nodetree"); - else if (in_out!=SOCK_OUT) + else if (in_out != SOCK_OUT) BKE_reportf(reports, RPT_ERROR, "Socket is not an output"); else { /* XXX should check if tree is a group here! no good way to do this currently. */ @@ -929,15 +929,15 @@ static void alloc_node_type_items(EnumPropertyItem *items, int category) int count = 3; EnumPropertyItem *item = items; - for(i=0; i<MaxNodes; i++) - if(nodes[i].defined && nodes[i].category == category) + for (i = 0; i<MaxNodes; i++) + if (nodes[i].defined && nodes[i].category == category) count++; /*item = items = MEM_callocN(count * sizeof(EnumPropertyItem), "alloc_node_type_items");*/ - for(i=0; i<MaxNodes; i++) { + for (i = 0; i<MaxNodes; i++) { NodeInfo *node = nodes + i; - if(node->defined && node->category == category) { + if (node->defined && node->category == category) { item->value = i; item->identifier = node->enum_name; item->icon = node->icon; @@ -1016,7 +1016,7 @@ static void def_whileloop(StructRNA *srna) static void def_frame(StructRNA *srna) { -// PropertyRNA *prop; +/* PropertyRNA *prop; */ } @@ -1165,37 +1165,37 @@ static void def_sh_mapping(StructRNA *srna) RNA_def_struct_sdna_from(srna, "TexMapping", "storage"); - prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION); + prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "loc"); RNA_def_property_ui_text(prop, "Location", ""); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER); /* Not PROP_XYZ, this is now in radians, no more degrees */ + prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER); /* Not PROP_XYZ, this is now in radians, no more degrees */ RNA_def_property_float_sdna(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Rotation", ""); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); + prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "size"); RNA_def_property_ui_text(prop, "Scale", ""); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "min", PROP_FLOAT, PROP_XYZ); + prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "min"); RNA_def_property_ui_text(prop, "Minimum", "Minimum value for clipping"); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "max", PROP_FLOAT, PROP_XYZ); + prop = RNA_def_property(srna, "max", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "max"); RNA_def_property_ui_text(prop, "Maximum", "Maximum value for clipping"); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MIN); RNA_def_property_ui_text(prop, "Has Minimum", "Whether to use minimum clipping value"); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); - prop= RNA_def_property(srna, "use_max", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_max", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MAX); RNA_def_property_ui_text(prop, "Has Maximum", "Whether to use maximum clipping value"); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); @@ -1234,12 +1234,12 @@ static void def_sh_tex(StructRNA *srna) { PropertyRNA *prop; - prop= RNA_def_property(srna, "texture_mapping", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "texture_mapping", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "base.tex_mapping"); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_ui_text(prop, "Texture Mapping", "Texture coordinate mapping settings"); - prop= RNA_def_property(srna, "color_mapping", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "color_mapping", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "base.color_mapping"); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_ui_text(prop, "Color Mapping", "Color mapping settings"); @@ -1263,7 +1263,7 @@ static void def_sh_tex_sky(StructRNA *srna) static void def_sh_tex_environment(StructRNA *srna) { - static const EnumPropertyItem prop_color_space_items[]= { + static const EnumPropertyItem prop_color_space_items[] = { {SHD_COLORSPACE_SRGB, "SRGB", 0, "sRGB", "Image is in sRGB color space"}, {SHD_COLORSPACE_LINEAR, "LINEAR", 0, "Linear", "Image is in scene linear color space"}, {0, NULL, 0, NULL, NULL}}; @@ -1280,7 +1280,7 @@ static void def_sh_tex_environment(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexImage", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_color_space_items); RNA_def_property_ui_text(prop, "Color Space", "Image file color space"); RNA_def_property_update(prop, 0, "rna_Node_update"); @@ -1288,7 +1288,7 @@ static void def_sh_tex_environment(StructRNA *srna) static void def_sh_tex_image(StructRNA *srna) { - static const EnumPropertyItem prop_color_space_items[]= { + static const EnumPropertyItem prop_color_space_items[] = { {SHD_COLORSPACE_LINEAR, "LINEAR", 0, "Linear", "Image is in scene linear color space"}, {SHD_COLORSPACE_SRGB, "SRGB", 0, "sRGB", "Image is in sRGB color space"}, {0, NULL, 0, NULL, NULL}}; @@ -1305,7 +1305,7 @@ static void def_sh_tex_image(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexImage", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "color_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_color_space_items); RNA_def_property_ui_text(prop, "Color Space", "Image file color space"); RNA_def_property_update(prop, 0, "rna_Node_update"); @@ -1328,7 +1328,7 @@ static void def_sh_tex_gradient(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexGradient", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "gradient_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "gradient_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, prop_gradient_type); RNA_def_property_ui_text(prop, "Gradient Type", "Style of the color blending"); RNA_def_property_update(prop, 0, "rna_Node_update"); @@ -1353,7 +1353,7 @@ static void def_sh_tex_magic(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexMagic", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "turbulence_depth", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "turbulence_depth", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "depth"); RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_text(prop, "Depth", "Level of detail in the added turbulent noise"); @@ -1375,7 +1375,7 @@ static void def_sh_tex_musgrave(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexMusgrave", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "musgrave_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "musgrave_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "musgrave_type"); RNA_def_property_enum_items(prop, prop_musgrave_type); RNA_def_property_ui_text(prop, "Type", ""); @@ -1394,7 +1394,7 @@ static void def_sh_tex_voronoi(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexVoronoi", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "coloring", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "coloring", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "coloring"); RNA_def_property_enum_items(prop, prop_coloring_items); RNA_def_property_ui_text(prop, "Coloring", ""); @@ -1413,7 +1413,7 @@ static void def_sh_tex_wave(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexWave", "storage"); def_sh_tex(srna); - prop= RNA_def_property(srna, "wave_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "wave_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "wave_type"); RNA_def_property_enum_items(prop, prop_wave_type_items); RNA_def_property_ui_text(prop, "Wave Type", ""); @@ -1437,7 +1437,7 @@ static void def_cmp_alpha_over(StructRNA *srna) { PropertyRNA *prop; - // XXX: Tooltip + /* XXX: Tooltip */ prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); RNA_def_property_ui_text(prop, "Convert Premul", ""); @@ -1720,7 +1720,7 @@ static void def_cmp_image(StructRNA *srna) RNA_def_property_ui_text(prop, "Auto-Refresh", "Always refresh image on frame changes"); /* copied from the rna_image.c */ RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "layer"); RNA_def_property_enum_items(prop, prop_image_layer_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_image_layer_itemf"); @@ -1740,7 +1740,7 @@ static void def_cmp_render_layers(StructRNA *srna) RNA_def_property_ui_text(prop, "Scene", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "layer", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom1"); RNA_def_property_enum_items(prop, prop_scene_layer_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_scene_layer_itemf"); @@ -2062,7 +2062,7 @@ static void def_cmp_channel_matte(StructRNA *srna) RNA_def_property_ui_text(prop, "Color Space", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "matte_channel", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "matte_channel", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom2"); RNA_def_property_enum_items(prop, prop_tri_channel_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_channel_itemf"); @@ -2917,28 +2917,28 @@ static void rna_def_nodetree_link_api(BlenderRNA *brna, PropertyRNA *cprop) FunctionRNA *func; RNA_def_property_srna(cprop, "NodeLinks"); - srna= RNA_def_struct(brna, "NodeLinks", NULL); + srna = RNA_def_struct(brna, "NodeLinks", NULL); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_text(srna, "Node Links", "Collection of Node Links"); - func= RNA_def_function(srna, "new", "rna_NodeTree_link_new"); + func = RNA_def_function(srna, "new", "rna_NodeTree_link_new"); RNA_def_function_ui_description(func, "Add a node link to this node tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "input", "NodeSocket", "", "The input socket"); + parm = RNA_def_pointer(func, "input", "NodeSocket", "", "The input socket"); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "output", "NodeSocket", "", "The output socket"); + parm = RNA_def_pointer(func, "output", "NodeSocket", "", "The output socket"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return */ - parm= RNA_def_pointer(func, "link", "NodeLink", "", "New node link"); + parm = RNA_def_pointer(func, "link", "NodeLink", "", "New node link"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "remove", "rna_NodeTree_link_remove"); + func = RNA_def_function(srna, "remove", "rna_NodeTree_link_remove"); RNA_def_function_ui_description(func, "remove a node link from the node tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "link", "NodeLink", "", "The node link to remove"); + parm = RNA_def_pointer(func, "link", "NodeLink", "", "The node link to remove"); RNA_def_property_flag(parm, PROP_REQUIRED); - func= RNA_def_function(srna, "clear", "rna_NodeTree_link_clear"); + func = RNA_def_function(srna, "clear", "rna_NodeTree_link_clear"); RNA_def_function_ui_description(func, "remove all node links from the node tree"); } @@ -2949,27 +2949,27 @@ static void rna_def_composite_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop) FunctionRNA *func; RNA_def_property_srna(cprop, "CompositorNodes"); - srna= RNA_def_struct(brna, "CompositorNodes", NULL); + srna = RNA_def_struct(brna, "CompositorNodes", NULL); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_text(srna, "Compositor Nodes", "Collection of Compositor Nodes"); - func= RNA_def_function(srna, "new", "rna_NodeTree_node_composite_new"); + func = RNA_def_function(srna, "new", "rna_NodeTree_node_composite_new"); RNA_def_function_ui_description(func, "Add a node to this node tree"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_enum(func, "type", compositor_node_type_items, 0, "Type", "Type of node to add"); + parm = RNA_def_enum(func, "type", compositor_node_type_items, 0, "Type", "Type of node to add"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_pointer(func, "group", "NodeTree", "", "The group tree"); /* return value */ - parm= RNA_def_pointer(func, "node", "Node", "", "New node"); + parm = RNA_def_pointer(func, "node", "Node", "", "New node"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); + func = RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); RNA_def_function_ui_description(func, "Remove a node from this node tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "node", "Node", "", "The node to remove"); + parm = RNA_def_pointer(func, "node", "Node", "", "The node to remove"); RNA_def_property_flag(parm, PROP_REQUIRED); - func= RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); + func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); RNA_def_function_ui_description(func, "Remove all nodes from this node tree"); } @@ -2980,27 +2980,27 @@ static void rna_def_shader_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop) FunctionRNA *func; RNA_def_property_srna(cprop, "ShaderNodes"); - srna= RNA_def_struct(brna, "ShaderNodes", NULL); + srna = RNA_def_struct(brna, "ShaderNodes", NULL); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_text(srna, "Shader Nodes", "Collection of Shader Nodes"); - func= RNA_def_function(srna, "new", "rna_NodeTree_node_new"); + func = RNA_def_function(srna, "new", "rna_NodeTree_node_new"); RNA_def_function_ui_description(func, "Add a node to this node tree"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_enum(func, "type", shader_node_type_items, 0, "Type", "Type of node to add"); + parm = RNA_def_enum(func, "type", shader_node_type_items, 0, "Type", "Type of node to add"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_pointer(func, "group", "NodeTree", "", "The group tree"); /* return value */ - parm= RNA_def_pointer(func, "node", "Node", "", "New node"); + parm = RNA_def_pointer(func, "node", "Node", "", "New node"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); + func = RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); RNA_def_function_ui_description(func, "Remove a node from this node tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "node", "Node", "", "The node to remove"); + parm = RNA_def_pointer(func, "node", "Node", "", "The node to remove"); RNA_def_property_flag(parm, PROP_REQUIRED); - func= RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); + func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); RNA_def_function_ui_description(func, "Remove all nodes from this node tree"); } @@ -3011,27 +3011,27 @@ static void rna_def_texture_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop) FunctionRNA *func; RNA_def_property_srna(cprop, "TextureNodes"); - srna= RNA_def_struct(brna, "TextureNodes", NULL); + srna = RNA_def_struct(brna, "TextureNodes", NULL); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_text(srna, "Texture Nodes", "Collection of Texture Nodes"); - func= RNA_def_function(srna, "new", "rna_NodeTree_node_texture_new"); + func = RNA_def_function(srna, "new", "rna_NodeTree_node_texture_new"); RNA_def_function_ui_description(func, "Add a node to this node tree"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); - parm= RNA_def_enum(func, "type", texture_node_type_items, 0, "Type", "Type of node to add"); + parm = RNA_def_enum(func, "type", texture_node_type_items, 0, "Type", "Type of node to add"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_pointer(func, "group", "NodeTree", "", "The group tree"); /* return value */ - parm= RNA_def_pointer(func, "node", "Node", "", "New node"); + parm = RNA_def_pointer(func, "node", "Node", "", "New node"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); + func = RNA_def_function(srna, "remove", "rna_NodeTree_node_remove"); RNA_def_function_ui_description(func, "Remove a node from this node tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "node", "Node", "", "The node to remove"); + parm = RNA_def_pointer(func, "node", "Node", "", "The node to remove"); RNA_def_property_flag(parm, PROP_REQUIRED); - func= RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); + func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear"); RNA_def_function_ui_description(func, "Remove all nodes from this node tree"); } @@ -3056,7 +3056,7 @@ static void rna_def_node_socket(BlenderRNA *brna) prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); /* XXX must be editable for group sockets. if necessary use a special rna definition for these */ -// RNA_def_property_clear_flag(prop, PROP_EDITABLE); +/* RNA_def_property_clear_flag(prop, PROP_EDITABLE); */ RNA_def_property_ui_text(prop, "Name", "Socket name"); RNA_def_struct_name_property(srna, prop); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_NodeGroupSocket_update"); @@ -3075,8 +3075,8 @@ static void rna_def_node_socket(BlenderRNA *brna) static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype, const char *name, const char *ui_name) { StructRNA *srna; - PropertyRNA *prop=NULL; - PropertySubType propsubtype= PROP_NONE; + PropertyRNA *prop = NULL; + PropertySubType propsubtype = PROP_NONE; #define SUBTYPE(socktype, stypename, id, idname) { PROP_##id, #socktype "_" #id, 0, #idname, ""}, static EnumPropertyItem subtype_items[] = { @@ -3252,28 +3252,28 @@ static void rna_def_group_sockets_api(BlenderRNA *brna, PropertyRNA *cprop, int PropertyRNA *parm; FunctionRNA *func; - RNA_def_property_srna(cprop, (in_out==SOCK_IN ? "GroupInputs" : "GroupOutputs")); - srna= RNA_def_struct(brna, (in_out==SOCK_IN ? "GroupInputs" : "GroupOutputs"), NULL); + RNA_def_property_srna(cprop, (in_out == SOCK_IN ? "GroupInputs" : "GroupOutputs")); + srna = RNA_def_struct(brna, (in_out == SOCK_IN ? "GroupInputs" : "GroupOutputs"), NULL); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_text(srna, "Group Sockets", "Collection of group sockets"); - func= RNA_def_function(srna, "new", (in_out==SOCK_IN ? "rna_NodeTree_input_new" : "rna_NodeTree_output_new")); + func = RNA_def_function(srna, "new", (in_out == SOCK_IN ? "rna_NodeTree_input_new" : "rna_NodeTree_output_new")); RNA_def_function_ui_description(func, "Add a socket to the group tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_string(func, "name", "Socket", MAX_NAME, "Name", "Name of the socket"); RNA_def_enum(func, "type", node_socket_type_items, SOCK_FLOAT, "Type", "Type of socket"); /* return value */ - parm= RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket"); + parm = RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket"); RNA_def_function_return(func, parm); - func= RNA_def_function(srna, "expose", (in_out==SOCK_IN ? "rna_NodeTree_input_expose" : "rna_NodeTree_output_expose")); + func = RNA_def_function(srna, "expose", (in_out == SOCK_IN ? "rna_NodeTree_input_expose" : "rna_NodeTree_output_expose")); RNA_def_function_ui_description(func, "Expose an internal socket in the group tree"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_pointer(func, "sock", "NodeSocket", "Socket", "Internal node socket to expose"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "add_link", TRUE, "Add Link", "If TRUE, adds a link to the internal socket"); /* return value */ - parm= RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket"); + parm = RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket"); RNA_def_function_return(func, parm); } @@ -3299,7 +3299,7 @@ static void rna_def_nodetree(BlenderRNA *brna) rna_def_nodetree_link_api(brna, prop); /* Grease Pencil */ - prop= RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "grease_pencil", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_struct_type(prop, "GreasePencil"); @@ -3386,7 +3386,7 @@ static void define_specific_node(BlenderRNA *brna, int id, void (*func)(StructRN { StructRNA *srna = def_node(brna, id); - if(func) + if (func) func(srna); } |