From aba4e6810f8b4d0e459137b64e061a2cadc457d1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 31 May 2019 23:21:16 +1000 Subject: Cleanup: style, use braces in source/ (include disabled blocks) --- source/blender/editors/space_node/drawnode.c | 12 +++++++---- source/blender/editors/space_node/node_edit.c | 30 +++++++++++++++++---------- 2 files changed, 27 insertions(+), 15 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index e39e024e44a..e63c8331f18 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -135,8 +135,9 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt if (cumap) { cumap->flag |= CUMA_DRAW_CFRA; - if (node->custom1 < node->custom2) + if (node->custom1 < node->custom2) { cumap->sample[0] = (float)(CFRA - node->custom1) / (float)(node->custom2 - node->custom1); + } } #endif @@ -205,8 +206,9 @@ static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v) bNode *node = node_v; Tex *tex; - if (node->menunr < 1) + if (node->menunr < 1) { return; + } if (node->id) { id_us_min(node->id); @@ -220,8 +222,9 @@ static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v) nodeSetActive(ntree, node); - if (ntree->type == NTREE_TEXTURE) + if (ntree->type == NTREE_TEXTURE) { ntreeTexCheckCyclics(ntree); + } // allqueue(REDRAWBUTSSHADING, 0); // allqueue(REDRAWNODE, 0); @@ -1143,8 +1146,9 @@ static void node_shader_buts_script_ex(uiLayout *layout, bContext *C, PointerRNA node_shader_buts_script(layout, C, ptr); #if 0 /* not implemented yet */ - if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL) + if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL) { uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE); + } #endif } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index fb34d9dc459..235bc6aeb96 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -745,10 +745,11 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) else if (ntree->type == NTREE_TEXTURE) { // XXX #if 0 - if (node->id) - ; // XXX BIF_preview_changed(-1); - // allqueue(REDRAWBUTSSHADING, 1); - // allqueue(REDRAWIPO, 0); + if (node->id) { + // XXX BIF_preview_changed(-1); + // allqueue(REDRAWBUTSSHADING, 1); + // allqueue(REDRAWIPO, 0); + } #endif } } @@ -784,17 +785,21 @@ static int edit_node_invoke_properties(bContext *C, wmOperator *op) { if (!RNA_struct_property_is_set(op->ptr, "node")) { bNode *node = CTX_data_pointer_get_type(C, "node", &RNA_Node).data; - if (!node) + if (!node) { return 0; - else + } + else { RNA_string_set(op->ptr, "node", node->name); + } } - if (!RNA_struct_property_is_set(op->ptr, "in_out")) + if (!RNA_struct_property_is_set(op->ptr, "in_out")) { RNA_enum_set(op->ptr, "in_out", SOCK_IN); + } - if (!RNA_struct_property_is_set(op->ptr, "socket")) + if (!RNA_struct_property_is_set(op->ptr, "socket")) { RNA_int_set(op->ptr, "socket", 0); + } return 1; } @@ -823,12 +828,15 @@ static void edit_node_properties_get( break; } - if (rnode) + if (rnode) { *rnode = node; - if (rsock) + } + if (rsock) { *rsock = sock; - if (rin_out) + } + if (rin_out) { *rin_out = in_out; + } } #endif -- cgit v1.2.3