diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 04:34:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-01 08:22:28 +0400 |
commit | 617557b08ea94e2b65a1697ddf0b79651204d92b (patch) | |
tree | 50b24bab075b42fa20456140c9a9681cfb01325b /source/blender/editors/space_node | |
parent | 2c00ecc738c04dc5dc22d4a6b81a1e937526ba6d (diff) |
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 280 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_buttons.c | 20 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 46 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_group.c | 22 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 34 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_select.c | 30 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_templates.c | 26 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_view.c | 20 | ||||
-rw-r--r-- | source/blender/editors/space_node/space_node.c | 2 |
12 files changed, 250 insertions, 250 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index d534eefb0a1..5e3ac42d865 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -148,7 +148,7 @@ static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr uiLayout *col; RNA_pointer_create(ptr->id.data, &RNA_NodeSocket, output, &sockptr); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiTemplateColorPicker(col, &sockptr, "default_value", 1, 0, 0, 0); uiItemR(col, &sockptr, "default_value", UI_ITEM_R_SLIDER, "", ICON_NONE); } @@ -159,8 +159,8 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA bNodeTree *ntree = (bNodeTree *)ptr->id.data; - col = uiLayoutColumn(layout, FALSE); - row = uiLayoutRow(col, TRUE); + col = uiLayoutColumn(layout, false); + row = uiLayoutRow(col, true); uiItemR(row, ptr, "blend_type", 0, "", ICON_NONE); if (ELEM(ntree->type, NTREE_COMPOSIT, NTREE_TEXTURE)) uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA); @@ -185,7 +185,7 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "frame_start", 0, IFACE_("Sta"), ICON_NONE); uiItemR(row, ptr, "frame_end", 0, IFACE_("End"), ICON_NONE); } @@ -425,7 +425,7 @@ static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode, float alpha; /* skip if out of view */ - if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == FALSE) { + if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == false) { uiEndBlock(C, node->block); node->block = NULL; return; @@ -646,7 +646,7 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr, if (!imaptr->data) return; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, imaptr, "source", 0, "", ICON_NONE); @@ -665,7 +665,7 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr, } if (ELEM(source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) { - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "frame_duration", 0, NULL, ICON_NONE); uiItemR(col, ptr, "frame_start", 0, NULL, ICON_NONE); uiItemR(col, ptr, "frame_offset", 0, NULL, ICON_NONE); @@ -673,7 +673,7 @@ static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr, uiItemR(col, ptr, "use_auto_refresh", 0, NULL, ICON_NONE); } - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); if (RNA_enum_get(imaptr, "type") == IMA_TYPE_MULTILAYER) uiItemR(col, ptr, "layer", 0, NULL, ICON_NONE); @@ -688,7 +688,7 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA if (!node->id) return; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "use_diffuse", 0, NULL, ICON_NONE); uiItemR(col, ptr, "use_specular", 0, NULL, ICON_NONE); uiItemR(col, ptr, "invert_normal", 0, NULL, ICON_NONE); @@ -700,31 +700,31 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), Poin uiItemR(layout, ptr, "vector_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); uiItemL(col, IFACE_("Location:"), ICON_NONE); uiItemR(col, ptr, "translation", 0, "", ICON_NONE); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); uiItemL(col, IFACE_("Rotation:"), ICON_NONE); uiItemR(col, ptr, "rotation", 0, "", ICON_NONE); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); uiItemL(col, IFACE_("Scale:"), ICON_NONE); uiItemR(col, ptr, "scale", 0, "", ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); uiItemR(col, ptr, "use_min", 0, IFACE_("Min"), ICON_NONE); - sub = uiLayoutColumn(col, TRUE); + sub = uiLayoutColumn(col, true); uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min")); uiItemR(sub, ptr, "min", 0, "", ICON_NONE); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); uiItemR(col, ptr, "use_max", 0, IFACE_("Max"), ICON_NONE); - sub = uiLayoutColumn(col, TRUE); + sub = uiLayoutColumn(col, true); uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max")); uiItemR(sub, ptr, "max", 0, "", ICON_NONE); } @@ -746,7 +746,7 @@ static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA PointerRNA obptr = CTX_data_pointer_get(C, "active_object"); uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) { PointerRNA dataptr = RNA_pointer_get(&obptr, "data"); @@ -839,11 +839,11 @@ static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), Po { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"), ICON_NONE); uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"), ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "squash", 0, IFACE_("Squash"), ICON_NONE); uiItemR(col, ptr, "squash_frequency", 0, IFACE_("Frequency"), ICON_NONE); } @@ -893,11 +893,11 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA * { uiLayout *split, *row; - split = uiLayoutSplit(layout, 0.0f, FALSE); + split = uiLayoutSplit(layout, 0.0f, false); uiItemR(split, ptr, "direction_type", 0, "", 0); - row = uiLayoutRow(split, FALSE); + row = uiLayoutRow(split, false); if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) { PointerRNA obptr = CTX_data_pointer_get(C, "active_object"); @@ -958,10 +958,10 @@ static void node_shader_buts_script(uiLayout *layout, bContext *UNUSED(C), Point { uiLayout *row; - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "mode", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_INTERNAL) uiItemR(row, ptr, "script", 0, "", ICON_NONE); @@ -1150,8 +1150,8 @@ static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, Point if (!node->id) return; - col = uiLayoutColumn(layout, FALSE); - row = uiLayoutRow(col, TRUE); + col = uiLayoutColumn(layout, false); + row = uiLayoutRow(col, true); uiItemR(row, ptr, "layer", 0, "", ICON_NONE); prop = RNA_struct_find_property(ptr, "layer"); @@ -1175,7 +1175,7 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point int reference; int filter; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); filter = RNA_enum_get(ptr, "filter_type"); reference = RNA_boolean_get(ptr, "use_variable_size"); @@ -1192,15 +1192,15 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point if (RNA_boolean_get(ptr, "use_relative")) { uiItemL(col, IFACE_("Aspect Correction"), ICON_NONE); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "aspect_correction", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "factor_x", 0, IFACE_("X"), ICON_NONE); uiItemR(col, ptr, "factor_y", 0, IFACE_("Y"), ICON_NONE); } else { - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "size_x", 0, IFACE_("X"), ICON_NONE); uiItemR(col, ptr, "size_y", 0, IFACE_("Y"), ICON_NONE); } @@ -1213,14 +1213,14 @@ static void node_composit_buts_dblur(uiLayout *layout, bContext *UNUSED(C), Poin uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "use_wrap", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(col, IFACE_("Center:"), ICON_NONE); uiItemR(col, ptr, "center_x", 0, IFACE_("X"), ICON_NONE); uiItemR(col, ptr, "center_y", 0, IFACE_("Y"), ICON_NONE); uiItemS(layout); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "distance", 0, NULL, ICON_NONE); uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE); @@ -1234,7 +1234,7 @@ static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *UNUSED( { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "iterations", 0, NULL, ICON_NONE); uiItemR(col, ptr, "sigma_color", 0, NULL, ICON_NONE); uiItemR(col, ptr, "sigma_space", 0, NULL, ICON_NONE); @@ -1244,29 +1244,29 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA { uiLayout *sub, *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemL(col, IFACE_("Bokeh Type:"), ICON_NONE); uiItemR(col, ptr, "bokeh", 0, "", ICON_NONE); uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); - uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer") == TRUE); + col = uiLayoutColumn(layout, false); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer") == true); uiItemR(col, ptr, "f_stop", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "blur_max", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "use_preview", 0, NULL, ICON_NONE); uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "use_zbuffer", 0, NULL, ICON_NONE); - sub = uiLayoutColumn(col, FALSE); - uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer") == FALSE); + sub = uiLayoutColumn(col, false); + uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer") == false); uiItemR(sub, ptr, "z_scale", 0, NULL, ICON_NONE); } @@ -1305,7 +1305,7 @@ static void node_composit_buts_tonemap(uiLayout *layout, bContext *UNUSED(C), Po { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "tonemap_type", 0, "", ICON_NONE); if (RNA_enum_get(ptr, "tonemap_type") == 0) { uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -1324,11 +1324,11 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *UNUSED(C), P { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "use_projector", 0, NULL, ICON_NONE); - col = uiLayoutColumn(col, FALSE); - uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector") == FALSE); + col = uiLayoutColumn(col, false); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector") == false); uiItemR(col, ptr, "use_jitter", 0, NULL, ICON_NONE); uiItemR(col, ptr, "use_fit", 0, NULL, ICON_NONE); } @@ -1337,11 +1337,11 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), Po { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "samples", 0, NULL, ICON_NONE); uiItemR(col, ptr, "factor", 0, IFACE_("Blur"), ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(col, IFACE_("Speed:"), ICON_NONE); uiItemR(col, ptr, "speed_min", 0, IFACE_("Min"), ICON_NONE); uiItemR(col, ptr, "speed_max", 0, IFACE_("Max"), ICON_NONE); @@ -1366,7 +1366,7 @@ static void node_composit_buts_crop(uiLayout *layout, bContext *UNUSED(C), Point uiItemR(layout, ptr, "use_crop_size", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "relative", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); if (RNA_boolean_get(ptr, "relative")) { uiItemR(col, ptr, "rel_min_x", 0, IFACE_("Left"), ICON_NONE); uiItemR(col, ptr, "rel_max_x", 0, IFACE_("Right"), ICON_NONE); @@ -1385,8 +1385,8 @@ static void node_composit_buts_splitviewer(uiLayout *layout, bContext *UNUSED(C) { uiLayout *row, *col; - col = uiLayoutColumn(layout, FALSE); - row = uiLayoutRow(col, FALSE); + col = uiLayoutColumn(layout, false); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE); uiItemR(col, ptr, "factor", 0, NULL, ICON_NONE); } @@ -1395,7 +1395,7 @@ static void node_composit_buts_double_edge_mask(uiLayout *layout, bContext *UNUS { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemL(col, IFACE_("Inner Edge:"), ICON_NONE); uiItemR(col, ptr, "inner_mode", 0, "", ICON_NONE); @@ -1407,7 +1407,7 @@ static void node_composit_buts_map_range(uiLayout *layout, bContext *UNUSED(C), { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "use_clamp", 0, NULL, ICON_NONE); } @@ -1415,19 +1415,19 @@ static void node_composit_buts_map_value(uiLayout *layout, bContext *UNUSED(C), { uiLayout *sub, *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "offset", 0, NULL, ICON_NONE); uiItemR(col, ptr, "size", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "use_min", 0, NULL, ICON_NONE); - sub = uiLayoutColumn(col, FALSE); + sub = uiLayoutColumn(col, false); uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min")); uiItemR(sub, ptr, "min", 0, "", ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "use_max", 0, NULL, ICON_NONE); - sub = uiLayoutColumn(col, FALSE); + sub = uiLayoutColumn(col, false); uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max")); uiItemR(sub, ptr, "max", 0, "", ICON_NONE); } @@ -1436,7 +1436,7 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C), { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "use_premultiply", 0, NULL, ICON_NONE); uiItemR(col, ptr, "premul", 0, NULL, ICON_NONE); } @@ -1445,7 +1445,7 @@ static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), P { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "use_alpha", 0, NULL, ICON_NONE); uiItemR(col, ptr, "use_antialias_z", 0, NULL, ICON_NONE); } @@ -1455,7 +1455,7 @@ static void node_composit_buts_hue_sat(uiLayout *layout, bContext *UNUSED(C), Po { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -1484,7 +1484,7 @@ static void node_composit_buts_despeckle(uiLayout *layout, bContext *UNUSED(C), { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE); uiItemR(col, ptr, "threshold_neighbor", 0, NULL, ICON_NONE); } @@ -1493,7 +1493,7 @@ static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C), { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } @@ -1502,10 +1502,10 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED { uiLayout *col, *row; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(layout, IFACE_("Color Space:"), ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE); uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -1517,21 +1517,21 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext *UNUSED(C) uiLayout *row, *col; uiItemL(layout, IFACE_("Despill Channel:"), ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE); if (RNA_enum_get(ptr, "limit_method") == 0) { uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE); } uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "use_unspill", 0, NULL, ICON_NONE); - if (RNA_boolean_get(ptr, "use_unspill") == TRUE) { + if (RNA_boolean_get(ptr, "use_unspill") == true) { uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -1542,11 +1542,11 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *UNUSED(C { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "tolerance", 0, NULL, ICON_NONE); uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE); Removed for now */ uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE); /*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, ICON_NONE); Removed for now*/ @@ -1556,7 +1556,7 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C) { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -1567,20 +1567,20 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *UNUSED( uiLayout *col, *row; uiItemL(layout, IFACE_("Color Space:"), ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemL(col, IFACE_("Key Channel:"), ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE); if (RNA_enum_get(ptr, "limit_method") == 0) { uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE); } @@ -1592,7 +1592,7 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C), { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } @@ -1628,14 +1628,14 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi int multilayer = (RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER); node_composit_buts_file_output(layout, C, ptr); - uiTemplateImageSettings(layout, &imfptr, FALSE); + uiTemplateImageSettings(layout, &imfptr, false); uiItemS(layout); uiItemO(layout, IFACE_("Add Input"), ICON_ZOOMIN, "NODE_OT_output_file_add_socket"); - row = uiLayoutRow(layout, FALSE); - col = uiLayoutColumn(row, TRUE); + row = uiLayoutRow(layout, false); + col = uiLayoutColumn(row, true); active_index = RNA_int_get(ptr, "active_input_index"); /* using different collection properties if multilayer format is enabled */ @@ -1654,7 +1654,7 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi /* XXX collection lookup does not return the ID part of the pointer, setting this manually here */ active_input_ptr.id.data = ptr->id.data; - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); op_ptr = uiItemFullO(col, "NODE_OT_output_file_move_active_socket", "", ICON_TRIA_UP, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&op_ptr, "direction", 1); @@ -1664,19 +1664,19 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi if (active_input_ptr.data) { if (multilayer) { - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(col, IFACE_("Layer:"), ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &active_input_ptr, "name", 0, "", ICON_NONE); uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "", ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY); } else { - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(col, IFACE_("File Subpath:"), ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &active_input_ptr, "path", 0, "", ICON_NONE); uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "", ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY); @@ -1684,13 +1684,13 @@ static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, Poi /* format details for individual files */ imfptr = RNA_pointer_get(&active_input_ptr, "format"); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemL(col, IFACE_("Format:"), ICON_NONE); uiItemR(col, &active_input_ptr, "use_node_format", 0, NULL, ICON_NONE); - col = uiLayoutColumn(layout, FALSE); - uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_node_format") == FALSE); - uiTemplateImageSettings(col, &imfptr, FALSE); + col = uiLayoutColumn(layout, false); + uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_node_format") == false); + uiTemplateImageSettings(col, &imfptr, false); } } } @@ -1702,7 +1702,7 @@ static void node_composit_buts_scale(uiLayout *layout, bContext *UNUSED(C), Poin if (RNA_enum_get(ptr, "space") == CMP_SCALE_RENDERPERCENT) { uiLayout *row; uiItemR(layout, ptr, "frame_method", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "offset_x", 0, "X", ICON_NONE); uiItemR(row, ptr, "offset_y", 0, "Y", ICON_NONE); } @@ -1717,7 +1717,7 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), Poi { uiLayout *col; - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemR(col, ptr, "invert_rgb", 0, NULL, ICON_NONE); uiItemR(col, ptr, "invert_alpha", 0, NULL, ICON_NONE); } @@ -1740,39 +1740,39 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C if (RNA_enum_get(ptr, "correction_method") == 0) { - split = uiLayoutSplit(layout, 0.0f, FALSE); - col = uiLayoutColumn(split, FALSE); + split = uiLayoutSplit(layout, 0.0f, false); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "lift", 1, 1, 0, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "lift", 0, NULL, ICON_NONE); - col = uiLayoutColumn(split, FALSE); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "gamma", 1, 1, 1, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "gamma", 0, NULL, ICON_NONE); - col = uiLayoutColumn(split, FALSE); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "gain", 1, 1, 1, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "gain", 0, NULL, ICON_NONE); } else { - split = uiLayoutSplit(layout, 0.0f, FALSE); - col = uiLayoutColumn(split, FALSE); + split = uiLayoutSplit(layout, 0.0f, false); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "offset", 1, 1, 0, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "offset", 0, NULL, ICON_NONE); - col = uiLayoutColumn(split, FALSE); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "power", 1, 1, 0, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "power", 0, NULL, ICON_NONE); - col = uiLayoutColumn(split, FALSE); + col = uiLayoutColumn(split, false); uiTemplateColorPicker(col, ptr, "slope", 1, 1, 0, 1); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, ptr, "slope", 0, NULL, ICON_NONE); } @@ -1885,12 +1885,12 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE { uiLayout *row; - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "red", 0, NULL, ICON_NONE); uiItemR(row, ptr, "green", 0, NULL, ICON_NONE); uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemL(row, "", ICON_NONE); uiItemL(row, IFACE_("Saturation"), ICON_NONE); uiItemL(row, IFACE_("Contrast"), ICON_NONE); @@ -1898,7 +1898,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemL(row, IFACE_("Gain"), ICON_NONE); uiItemL(row, IFACE_("Lift"), ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemL(row, IFACE_("Master"), ICON_NONE); uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE); @@ -1906,7 +1906,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemR(row, ptr, "master_gain", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, "", ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemL(row, IFACE_("Highlights"), ICON_NONE); uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE); @@ -1914,7 +1914,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemR(row, ptr, "highlights_gain", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, "", ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemL(row, IFACE_("Midtones"), ICON_NONE); uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE); @@ -1922,7 +1922,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemR(row, ptr, "midtones_gain", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, "", ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemL(row, IFACE_("Shadows"), ICON_NONE); uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE); @@ -1930,7 +1930,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSE uiItemR(row, ptr, "shadows_gain", UI_ITEM_R_SLIDER, "", ICON_NONE); uiItemR(row, ptr, "shadows_lift", UI_ITEM_R_SLIDER, "", ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "midtones_start", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } @@ -1939,7 +1939,7 @@ static void node_composit_buts_colorcorrection_ex(uiLayout *layout, bContext *UN { uiLayout *row; - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "red", 0, NULL, ICON_NONE); uiItemR(row, ptr, "green", 0, NULL, ICON_NONE); uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE); @@ -1974,7 +1974,7 @@ static void node_composit_buts_colorcorrection_ex(uiLayout *layout, bContext *UN uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(row, ptr, "shadows_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); uiItemR(row, ptr, "midtones_start", 0, NULL, ICON_NONE); uiItemR(row, ptr, "midtones_end", 0, NULL, ICON_NONE); } @@ -1988,11 +1988,11 @@ static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C), Po { uiLayout *row; - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "x", 0, NULL, ICON_NONE); uiItemR(row, ptr, "y", 0, NULL, ICON_NONE); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -2116,10 +2116,10 @@ static void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop static void node_composit_buts_ellipsemask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { uiLayout *row; - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "x", 0, NULL, ICON_NONE); uiItemR(row, ptr, "y", 0, NULL, ICON_NONE); - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE); uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE); @@ -2144,7 +2144,7 @@ static void node_composit_buts_viewer_ex(uiLayout *layout, bContext *UNUSED(C), uiItemR(layout, ptr, "use_alpha", 0, NULL, ICON_NONE); uiItemR(layout, ptr, "tile_order", 0, NULL, ICON_NONE); if (RNA_enum_get(ptr, "tile_order") == 0) { - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "center_x", 0, NULL, ICON_NONE); uiItemR(col, ptr, "center_y", 0, NULL, ICON_NONE); } @@ -2185,7 +2185,7 @@ static void node_composit_buts_keyingscreen(uiLayout *layout, bContext *C, Point RNA_pointer_create(&clip->id, &RNA_MovieTracking, &clip->tracking, &tracking_ptr); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA); } } @@ -2224,7 +2224,7 @@ static void node_composit_buts_trackpos(uiLayout *layout, bContext *C, PointerRN RNA_pointer_create(&clip->id, &RNA_MovieTracking, tracking, &tracking_ptr); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA); object = BKE_tracking_object_get_named(tracking, data->tracking_object); @@ -2263,7 +2263,7 @@ static void node_composit_buts_planetrackdeform(uiLayout *layout, bContext *C, P RNA_pointer_create(&clip->id, &RNA_MovieTracking, tracking, &tracking_ptr); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA); object = BKE_tracking_object_get_named(tracking, data->tracking_object); @@ -2517,11 +2517,11 @@ static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), Poin { uiLayout *col; - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"), ICON_NONE); uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"), ICON_NONE); - col = uiLayoutColumn(layout, TRUE); + col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "squash", 0, IFACE_("Squash"), ICON_NONE); uiItemR(col, ptr, "squash_frequency", 0, IFACE_("Frequency"), ICON_NONE); } @@ -2536,23 +2536,23 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe RNA_pointer_create(id, &RNA_Texture, tex, &tex_ptr); - col = uiLayoutColumn(layout, FALSE); + col = uiLayoutColumn(layout, false); switch (tex->type) { case TEX_BLEND: uiItemR(col, &tex_ptr, "progression", 0, "", ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE); break; case TEX_MARBLE: - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "marble_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_basis", 0, "", ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); break; @@ -2561,9 +2561,9 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe break; case TEX_STUCCI: - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "stucci_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); break; @@ -2571,18 +2571,18 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe case TEX_WOOD: uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); uiItemR(col, &tex_ptr, "wood_type", 0, "", ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiLayoutSetActive(row, !(ELEM(tex->stype, TEX_BAND, TEX_RING))); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); break; case TEX_CLOUDS: uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "cloud_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - row = uiLayoutRow(col, FALSE); + row = uiLayoutRow(col, false); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE); uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, IFACE_("Depth"), ICON_NONE); break; @@ -2833,7 +2833,7 @@ static void node_file_output_socket_draw(bContext *C, uiLayout *layout, PointerR PointerRNA inputptr, imfptr; int imtype; - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); imfptr = RNA_pointer_get(node_ptr, "format"); imtype = RNA_enum_get(&imfptr, "file_format"); @@ -3414,7 +3414,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link) /* new connection */ if (!link->fromsock || !link->tosock) { th_col1 = TH_ACTIVE; - do_triple = TRUE; + do_triple = true; } else { /* going to give issues once... */ @@ -3435,8 +3435,8 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link) if (link->tonode && link->tonode->flag & SELECT) th_col2 = TH_EDGE_SELECT; } - do_shaded = TRUE; - do_triple = TRUE; + do_shaded = true; + do_triple = true; } else { th_col1 = TH_REDALERT; diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 428495542c2..02e6f9b69f3 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -82,7 +82,7 @@ bNode *node_add_node(const bContext *C, const char *idname, int type, float locx /* generics */ node->locx = locx; node->locy = locy + 60.0f; /* arbitrary... so its visible, (0,0) is top of node */ - nodeSetSelected(node, TRUE); + nodeSetSelected(node, true); node->locx = locx; node->locy = locy + 60.0f; diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 035287c0411..ebff840dc9f 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -87,7 +87,7 @@ static void node_sockets_panel(const bContext *C, Panel *pa) for (sock = node->inputs.first; sock; sock = sock->next) { BLI_snprintf(name, sizeof(name), "%s:", sock->name); - split = uiLayoutSplit(layout, 0.35f, FALSE); + split = uiLayoutSplit(layout, 0.35f, false); uiItemL(split, name, ICON_NONE); uiTemplateNodeLink(split, ntree, node, sock); } @@ -107,20 +107,20 @@ static bool node_tree_find_active_socket(bNodeTree *ntree, bNodeSocket **r_sock, if (sock->flag & SELECT) { *r_sock = sock; *r_in_out = SOCK_IN; - return TRUE; + return true; } } for (sock = ntree->outputs.first; sock; sock = sock->next) { if (sock->flag & SELECT) { *r_sock = sock; *r_in_out = SOCK_OUT; - return TRUE; + return true; } } *r_sock = NULL; *r_in_out = 0; - return FALSE; + return false; } static void node_tree_interface_panel(const bContext *C, Panel *pa) @@ -140,31 +140,31 @@ static void node_tree_interface_panel(const bContext *C, Panel *pa) node_tree_find_active_socket(ntree, &sock, &in_out); RNA_pointer_create((ID *)ntree, &RNA_NodeSocketInterface, sock, &sockptr); - row = uiLayoutRow(layout, FALSE); + row = uiLayoutRow(layout, false); - split = uiLayoutRow(row, TRUE); - col = uiLayoutColumn(split, TRUE); + split = uiLayoutRow(row, true); + col = uiLayoutColumn(split, true); uiItemL(col, IFACE_("Inputs:"), ICON_NONE); uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "inputs", &ptr, "inputs", &ptr, "active_input", 0, 0, 0, 0); opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "in_out", SOCK_IN); - col = uiLayoutColumn(split, TRUE); + col = uiLayoutColumn(split, true); uiItemL(col, IFACE_("Outputs:"), ICON_NONE); uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "outputs", &ptr, "outputs", &ptr, "active_output", 0, 0, 0, 0); opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "in_out", SOCK_OUT); - col = uiLayoutColumn(row, TRUE); + col = uiLayoutColumn(row, true); opptr = uiItemFullO(col, "NODE_OT_tree_socket_move", "", ICON_TRIA_UP, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "direction", 1); opptr = uiItemFullO(col, "NODE_OT_tree_socket_move", "", ICON_TRIA_DOWN, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "direction", 2); if (sock) { - row = uiLayoutRow(layout, TRUE); + row = uiLayoutRow(layout, true); uiItemR(row, &sockptr, "name", 0, NULL, ICON_NONE); uiItemO(row, "", ICON_X, "NODE_OT_tree_socket_remove"); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 632bf1d3b14..f3d02c179ff 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -765,7 +765,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN nodeSynchronizeID(node, false); /* skip if out of view */ - if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == FALSE) { + if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == false) { uiEndBlock(C, node->block); node->block = NULL; return; @@ -1340,7 +1340,7 @@ void drawnodespace(const bContext *C, ARegion *ar) if (snode->flag & SNODE_SHOW_GPENCIL) { /* draw grease-pencil ('canvas' strokes) */ - draw_gpencil_view2d(C, TRUE); + draw_gpencil_view2d(C, true); } } else { @@ -1359,7 +1359,7 @@ void drawnodespace(const bContext *C, ARegion *ar) if (snode->treepath.last) { if (snode->flag & SNODE_SHOW_GPENCIL) { /* draw grease-pencil (screen strokes, and also paintbuffer) */ - draw_gpencil_view2d(C, FALSE); + draw_gpencil_view2d(C, false); } } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 3ca87f7cd00..ac0834cd635 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -176,8 +176,8 @@ static void compo_statsdrawjob(void *cjv, char *UNUSED(str)) { CompoJob *cj = cjv; - *(cj->do_update) = TRUE; - cj->need_sync = TRUE; + *(cj->do_update) = true; + cj->need_sync = true; } /* called by compo, wmJob sends notifier */ @@ -185,7 +185,7 @@ static void compo_redrawjob(void *cjv) { CompoJob *cj = cjv; - *(cj->do_update) = TRUE; + *(cj->do_update) = true; } static void compo_freejob(void *cjv) @@ -219,7 +219,7 @@ static void compo_updatejob(void *cjv) /* was used by old compositor system only */ ntreeLocalSync(cj->localtree, cj->ntree); - cj->need_sync = FALSE; + cj->need_sync = false; } WM_main_add_notifier(NC_SCENE | ND_COMPO_RESULT, NULL); @@ -240,7 +240,7 @@ static void compo_startjob(void *cjv, short *stop, short *do_update, float *prog bNodeTree *ntree = cj->localtree; Scene *scene = cj->scene; - if (scene->use_nodes == FALSE) + if (scene->use_nodes == false) return; cj->stop = stop; @@ -259,7 +259,7 @@ static void compo_startjob(void *cjv, short *stop, short *do_update, float *prog // XXX BIF_store_spare(); /* 1 is do_previews */ - ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, FALSE, TRUE, &scene->view_settings, &scene->display_settings); + ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, false, true, &scene->view_settings, &scene->display_settings); ntree->test_break = NULL; ntree->stats_draw = NULL; @@ -285,7 +285,7 @@ void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, Scene } #ifdef USE_ESC_COMPO - G.is_break = FALSE; + G.is_break = false; #endif wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene_owner, "Compositing", @@ -619,7 +619,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) if (node->type != NODE_GROUP) { const bool was_output = (node->flag & NODE_DO_OUTPUT) != 0; - int do_update = 0; + bool do_update = false; /* generic node group output: set node as active output */ if (node->type == NODE_GROUP_OUTPUT) { @@ -1205,9 +1205,9 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) /* has been set during copy above */ newnode = node->new_node; - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); node->flag &= ~NODE_ACTIVE; - nodeSetSelected(newnode, TRUE); + nodeSetSelected(newnode, true); } /* make sure we don't copy new nodes again! */ @@ -1248,11 +1248,11 @@ bool ED_node_select_check(ListBase *lb) for (node = lb->first; node; node = node->next) { if (node->flag & NODE_SELECT) { - return TRUE; + return true; } } - return FALSE; + return false; } /* ******************************** */ @@ -2012,15 +2012,15 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op) } /* only warn */ - if (is_clipboard_valid == FALSE) { + if (is_clipboard_valid == false) { BKE_report(op->reports, RPT_WARNING, "Some nodes references could not be restored, will be left empty"); } /* make sure all clipboard nodes would be valid in the target tree */ - all_nodes_valid = TRUE; + all_nodes_valid = true; for (node = clipboard_nodes_lb->first; node; node = node->next) { if (!node->typeinfo->poll_instance(node, ntree)) { - all_nodes_valid = FALSE; + all_nodes_valid = false; BKE_reportf(op->reports, RPT_ERROR, "Cannot add node %s into node tree %s", node->name, ntree->id.name + 2); } } @@ -2048,7 +2048,7 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op) id_us_plus(node->id); /* pasted nodes are selected */ - nodeSetSelected(new_node, TRUE); + nodeSetSelected(new_node, true); } /* reparent copied nodes */ @@ -2317,10 +2317,10 @@ static int node_shader_script_update_poll(bContext *C) /* recursively check for script nodes in groups using this text and update */ static int node_shader_script_update_text_recursive(RenderEngine *engine, RenderEngineType *type, bNodeTree *ntree, Text *text) { - int found = FALSE; + int found = false; bNode *node; - ntree->done = TRUE; + ntree->done = true; /* update each script that is using this text datablock */ for (node = ntree->nodes.first; node; node = node->next) { @@ -2331,7 +2331,7 @@ static int node_shader_script_update_text_recursive(RenderEngine *engine, Render } else if (node->type == SH_NODE_SCRIPT && node->id == &text->id) { type->update_script_node(engine, ntree, node); - found = TRUE; + found = true; } } @@ -2348,7 +2348,7 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op) bNode *node = NULL; RenderEngine *engine; RenderEngineType *type; - int found = FALSE; + int found = false; /* setup render engine */ type = RE_engines_find(scene->r.engine); @@ -2369,7 +2369,7 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op) /* update single node */ type->update_script_node(engine, ntree, node); - found = TRUE; + found = true; } else { /* update all nodes using text datablock */ @@ -2379,7 +2379,7 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op) /* clear flags for recursion check */ FOREACH_NODETREE(bmain, ntree, id) { if (ntree->type == NTREE_SHADER) - ntree->done = FALSE; + ntree->done = false; } FOREACH_NODETREE_END FOREACH_NODETREE(bmain, ntree, id) { @@ -2514,5 +2514,5 @@ void NODE_OT_viewer_border(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - WM_operator_properties_gesture_border(ot, TRUE); + WM_operator_properties_gesture_border(ot, true); } diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 20e6900a268..05348acfae7 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -179,7 +179,7 @@ void NODE_OT_group_edit(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - RNA_def_boolean(ot->srna, "exit", FALSE, "Exit", ""); + RNA_def_boolean(ot->srna, "exit", false, "Exit", ""); } /* ******************** Ungroup operator ********************** */ @@ -203,7 +203,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode) * - ngroup (i.e. the source NodeTree) is left unscathed * - temp copy. don't change ID usercount */ - wgroup = ntreeCopyTree_ex(ngroup, FALSE); + wgroup = ntreeCopyTree_ex(ngroup, false); /* Add the nodes into the ntree */ for (node = wgroup->nodes.first; node; node = nextnode) { @@ -401,7 +401,7 @@ static int node_group_separate_selected(bNodeTree *ntree, bNodeTree *ngroup, flo /* deselect all nodes in the target tree */ for (node = ntree->nodes.first; node; node = node->next) - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); /* clear new pointers, set in nodeCopyNode */ for (node = ngroup->nodes.first; node; node = node->next) @@ -415,7 +415,7 @@ static int node_group_separate_selected(bNodeTree *ntree, bNodeTree *ngroup, flo /* ignore interface nodes */ if (ELEM(node->type, NODE_GROUP_INPUT, NODE_GROUP_OUTPUT)) { - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); continue; } @@ -684,7 +684,7 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree, ListBase anim_basepaths = {NULL, NULL}; float min[2], max[2], center[2]; int totselect; - int expose_all = FALSE; + int expose_all = false; bNode *input_node, *output_node; /* XXX rough guess, not nice but we don't have access to UI constants here ... */ @@ -693,7 +693,7 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree, /* deselect all nodes in the target tree */ for (node = ngroup->nodes.first; node; node = node->next) - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); totselect = node_get_selected_minmax(ntree, gnode, min, max); add_v2_v2v2(center, min, max); @@ -701,7 +701,7 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree, /* auto-add interface for "solo" nodes */ if (totselect == 1) - expose_all = TRUE; + expose_all = true; /* move nodes over */ for (node = ntree->nodes.first; node; node = nextn) { @@ -831,10 +831,10 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree, if (node_group_make_use_node(node, gnode)) { for (sock = node->inputs.first; sock; sock = sock->next) { bNodeSocket *iosock, *input_sock; - int skip = FALSE; + int skip = false; for (link = ngroup->links.first; link; link = link->next) { if (link->tosock == sock) { - skip = TRUE; + skip = true; break; } } @@ -852,10 +852,10 @@ static void node_group_make_insert_selected(const bContext *C, bNodeTree *ntree, for (sock = node->outputs.first; sock; sock = sock->next) { bNodeSocket *iosock, *output_sock; - int skip = FALSE; + int skip = false; for (link = ngroup->links.first; link; link = link->next) if (link->fromsock == sock) - skip = TRUE; + skip = true; if (skip) continue; diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index dcc72afa362..ac541ef6a28 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -143,7 +143,7 @@ void ED_operatormacros_node(void) "Move nodes and attach to frame", OPTYPE_UNDO | OPTYPE_REGISTER); mot = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); - RNA_boolean_set(mot->ptr, "release_confirm", TRUE); + RNA_boolean_set(mot->ptr, "release_confirm", true); WM_operatortype_macro_define(ot, "NODE_OT_attach"); ot = WM_operatortype_append_macro("NODE_OT_detach_translate_attach", "Detach and Move", @@ -151,7 +151,7 @@ void ED_operatormacros_node(void) OPTYPE_UNDO | OPTYPE_REGISTER); WM_operatortype_macro_define(ot, "NODE_OT_detach"); mot = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); - RNA_boolean_set(mot->ptr, "release_confirm", TRUE); + RNA_boolean_set(mot->ptr, "release_confirm", true); WM_operatortype_macro_define(ot, "NODE_OT_attach"); ot = WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", @@ -165,7 +165,7 @@ void ED_operatormacros_node(void) "Duplicate selected nodes keeping input links and move them", OPTYPE_UNDO | OPTYPE_REGISTER); mot = WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); - RNA_boolean_set(mot->ptr, "keep_inputs", TRUE); + RNA_boolean_set(mot->ptr, "keep_inputs", true); WM_operatortype_macro_define(ot, "NODE_OT_translate_attach"); ot = WM_operatortype_append_macro("NODE_OT_move_detach_links", "Detach", "Move a node to detach links", @@ -222,24 +222,24 @@ void node_keymap(struct wmKeyConfig *keyconf) * NOTE 3: select op is registered for various combinations of modifier key, so the specialized * grab operators (unlink, attach, etc.) can work easily on single nodes. */ - node_select_keymap(keymap, FALSE); - node_select_keymap(keymap, TRUE); + node_select_keymap(keymap, false); + node_select_keymap(keymap, true); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_border", EVT_TWEAK_S, KM_ANY, 0, 0); - RNA_boolean_set(kmi->ptr, "tweak", TRUE); + RNA_boolean_set(kmi->ptr, "tweak", true); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "deselect", FALSE); + RNA_boolean_set(kmi->ptr, "deselect", false); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_SHIFT | KM_ALT, 0); - RNA_boolean_set(kmi->ptr, "deselect", TRUE); + RNA_boolean_set(kmi->ptr, "deselect", true); WM_keymap_add_item(keymap, "NODE_OT_select_circle", CKEY, KM_PRESS, 0, 0); /* each of these falls through if not handled... */ kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "detach", FALSE); + RNA_boolean_set(kmi->ptr, "detach", false); kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(kmi->ptr, "detach", TRUE); + RNA_boolean_set(kmi->ptr, "detach", true); WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0); @@ -256,9 +256,9 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_backimage_sample", ACTIONMOUSE, KM_PRESS, KM_ALT, 0); kmi = WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "replace", FALSE); + RNA_boolean_set(kmi->ptr, "replace", false); kmi = WM_keymap_add_item(keymap, "NODE_OT_link_make", FKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "replace", TRUE); + RNA_boolean_set(kmi->ptr, "replace", true); WM_keymap_add_menu(keymap, "NODE_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "NODE_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0); @@ -279,7 +279,7 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_border", BKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "tweak", FALSE); + RNA_boolean_set(kmi->ptr, "tweak", false); WM_keymap_add_item(keymap, "NODE_OT_delete", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_delete", DELKEY, KM_PRESS, 0, 0); @@ -295,9 +295,9 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_select_same_type", GKEY, KM_PRESS, KM_SHIFT, 0); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_same_type_step", RIGHTBRACKETKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "prev", FALSE); + RNA_boolean_set(kmi->ptr, "prev", false); kmi = WM_keymap_add_item(keymap, "NODE_OT_select_same_type_step", LEFTBRACKETKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "prev", TRUE); + RNA_boolean_set(kmi->ptr, "prev", true); WM_keymap_add_item(keymap, "NODE_OT_find_node", FKEY, KM_PRESS, KM_CTRL, 0); @@ -306,9 +306,9 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "NODE_OT_group_separate", PKEY, KM_PRESS, 0, 0); kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0); - RNA_boolean_set(kmi->ptr, "exit", FALSE); + RNA_boolean_set(kmi->ptr, "exit", false); kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "exit", TRUE); + RNA_boolean_set(kmi->ptr, "exit", true); WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0); diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index 3e1e605682f..7d9bf4b67f2 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -691,7 +691,7 @@ void NODE_OT_link(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING; - RNA_def_boolean(ot->srna, "detach", FALSE, "Detach", "Detach and redirect existing links"); + RNA_def_boolean(ot->srna, "detach", false, "Detach", "Detach and redirect existing links"); } /* ********************** Make Link operator ***************** */ @@ -770,7 +770,7 @@ static int cut_links_exec(bContext *C, wmOperator *op) RNA_END; if (i > 1) { - int found = FALSE; + int found = false; bNodeLink *link, *next; ED_preview_kill_jobs(C); @@ -782,9 +782,9 @@ static int cut_links_exec(bContext *C, wmOperator *op) if (cut_links_intersect(link, mcoords, i)) { - if (found == FALSE) { + if (found == false) { ED_preview_kill_jobs(C); - found = TRUE; + found = true; } snode_update(snode, link->tonode); @@ -1057,7 +1057,7 @@ static int node_attach_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent if (node->flag & NODE_SELECT) { if (node->parent == NULL) { /* disallow moving a parent into its child */ - if (nodeAttachNodeCheck(frame, node) == FALSE) { + if (nodeAttachNodeCheck(frame, node) == false) { /* attach all unparented nodes */ nodeAttachNode(node, frame); } @@ -1072,7 +1072,7 @@ static int node_attach_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent if (parent) { /* disallow moving a parent into its child */ - if (nodeAttachNodeCheck(frame, node) == FALSE) { + if (nodeAttachNodeCheck(frame, node) == false) { nodeDetachNode(node); nodeAttachNode(node, frame); } diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 89f07950fe9..d9e1f4fa611 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -141,7 +141,7 @@ void node_deselect_all(SpaceNode *snode) bNode *node; for (node = snode->edittree->nodes.first; node; node = node->next) - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); } void node_deselect_all_input_sockets(SpaceNode *snode, const bool deselect_nodes) @@ -227,12 +227,12 @@ int node_select_same_type(SpaceNode *snode) if (p->type != nac->type && p->flag & SELECT) { /* if it's selected but different type, unselect */ redraw = 1; - nodeSetSelected(p, FALSE); + nodeSetSelected(p, false); } else if (p->type == nac->type && (!(p->flag & SELECT))) { /* if it's the same type and is not selected, select! */ redraw = 1; - nodeSetSelected(p, TRUE); + nodeSetSelected(p, true); } } return(redraw); @@ -274,8 +274,8 @@ int node_select_same_type_np(SpaceNode *snode, int dir) if (p) { for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) if (tnode != p) - nodeSetSelected(tnode, FALSE); - nodeSetSelected(p, TRUE); + nodeSetSelected(tnode, false); + nodeSetSelected(p, true); return(1); } return(0); @@ -289,8 +289,8 @@ void node_select_single(bContext *C, bNode *node) for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) if (tnode != node) - nodeSetSelected(tnode, FALSE); - nodeSetSelected(node, TRUE); + nodeSetSelected(tnode, false); + nodeSetSelected(node, true); ED_node_set_active(bmain, snode->edittree, node); ED_node_set_active_viewer_key(snode); @@ -365,7 +365,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) { nodeSetSelected(tnode, false); } - nodeSetSelected(node, TRUE); + nodeSetSelected(node, true); ED_node_set_active(bmain, snode->edittree, node); selected = 1; } @@ -460,7 +460,7 @@ static int node_borderselect_exec(bContext *C, wmOperator *op) nodeSetSelected(node, (gesture_mode == GESTURE_MODAL_SELECT)); } else if (!extend) { - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); } } @@ -510,7 +510,7 @@ void NODE_OT_select_border(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* rna */ - WM_operator_properties_gesture_border(ot, TRUE); + WM_operator_properties_gesture_border(ot, true); RNA_def_boolean(ot->srna, "tweak", 0, "Tweak", "Only activate when mouse is not over a node - useful for tweak gesture"); } @@ -672,10 +672,10 @@ static int node_select_all_exec(bContext *C, wmOperator *op) for (node = node_lb->first; node; node = node->next) { switch (action) { case SEL_SELECT: - nodeSetSelected(node, TRUE); + nodeSetSelected(node, true); break; case SEL_DESELECT: - nodeSetSelected(node, FALSE); + nodeSetSelected(node, false); break; case SEL_INVERT: nodeSetSelected(node, !(node->flag & SELECT)); @@ -726,7 +726,7 @@ static int node_select_linked_to_exec(bContext *C, wmOperator *UNUSED(op)) for (node = snode->edittree->nodes.first; node; node = node->next) { if (node->flag & NODE_TEST) - nodeSetSelected(node, TRUE); + nodeSetSelected(node, true); } ED_node_sort(snode->edittree); @@ -770,7 +770,7 @@ static int node_select_linked_from_exec(bContext *C, wmOperator *UNUSED(op)) for (node = snode->edittree->nodes.first; node; node = node->next) { if (node->flag & NODE_TEST) - nodeSetSelected(node, TRUE); + nodeSetSelected(node, true); } ED_node_sort(snode->edittree); @@ -985,7 +985,7 @@ static uiBlock *node_find_menu(bContext *C, ARegion *ar, void *arg_op) event.type = EVT_BUT_OPEN; event.val = KM_PRESS; event.customdata = but; - event.customdatafree = FALSE; + event.customdatafree = false; wm_event_add(win, &event); return block; diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index c75c16e61c5..44639b1295c 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -512,7 +512,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_ bNodeTreeType *ntreetype = arg->ntree->typeinfo; uiBlockSetCurLayout(block, layout); - split = uiLayoutSplit(layout, 0.0f, FALSE); + split = uiLayoutSplit(layout, 0.0f, false); arg->bmain = bmain; arg->scene = scene; @@ -521,7 +521,7 @@ static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void *but_ if (ntreetype && ntreetype->foreach_nodeclass) ntreetype->foreach_nodeclass(scene, arg, node_menu_column_foreach_cb); - column = uiLayoutColumn(split, FALSE); + column = uiLayoutColumn(split, false); uiBlockSetCurLayout(block, column); if (sock->link) { @@ -588,9 +588,9 @@ static void ui_node_draw_node(uiLayout *layout, bContext *C, bNodeTree *ntree, b if (node->typeinfo->draw_buttons) { if (node->type != NODE_GROUP) { - split = uiLayoutSplit(layout, 0.35f, FALSE); - col = uiLayoutColumn(split, FALSE); - col = uiLayoutColumn(split, FALSE); + split = uiLayoutSplit(layout, 0.35f, false); + col = uiLayoutColumn(split, false); + col = uiLayoutColumn(split, false); node->typeinfo->draw_buttons(col, C, &nodeptr); } @@ -632,9 +632,9 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree, BLI_snprintf(label, UI_MAX_NAME_STR, "%s%s:", label, IFACE_(input->name)); /* split in label and value */ - split = uiLayoutSplit(layout, 0.35f, FALSE); + split = uiLayoutSplit(layout, 0.35f, false); - row = uiLayoutRow(split, TRUE); + row = uiLayoutRow(split, true); if (depth > 0) { uiBlockSetEmboss(block, UI_EMBOSSN); @@ -657,7 +657,7 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree, bt->drawflag = UI_BUT_TEXT_LEFT; if (dependency_loop) { - row = uiLayoutRow(split, FALSE); + row = uiLayoutRow(split, false); uiItemL(row, IFACE_("Dependency Loop"), ICON_ERROR); } else if (lnode) { @@ -680,22 +680,22 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree, case SOCK_BOOLEAN: case SOCK_RGBA: case SOCK_STRING: - row = uiLayoutRow(split, TRUE); + row = uiLayoutRow(split, true); uiItemR(row, &inputptr, "default_value", 0, "", ICON_NONE); break; case SOCK_VECTOR: - row = uiLayoutRow(split, FALSE); - col = uiLayoutColumn(row, FALSE); + row = uiLayoutRow(split, false); + col = uiLayoutColumn(row, false); uiItemR(col, &inputptr, "default_value", 0, "", ICON_NONE); break; default: - row = uiLayoutRow(split, FALSE); + row = uiLayoutRow(split, false); break; } } else - row = uiLayoutRow(split, FALSE); + row = uiLayoutRow(split, false); uiTemplateNodeLink(row, ntree, node, input); } diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index a8ab96067d5..90b9c2071de 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -88,7 +88,7 @@ int space_node_view_flag(bContext *C, SpaceNode *snode, ARegion *ar, tot++; if (node->type == NODE_FRAME) { - has_frame = TRUE; + has_frame = true; } } } @@ -102,7 +102,7 @@ int space_node_view_flag(bContext *C, SpaceNode *snode, ARegion *ar, /* for single non-frame nodes, don't zoom in, just pan view, * but do allow zooming out, this allows for big nodes to be zoomed out */ if ((tot == 1) && - (has_frame == FALSE) && + (has_frame == false) && ((oldwidth * oldheight) > (width * height))) { /* center, don't zoom */ @@ -411,7 +411,7 @@ static void sample_draw(const bContext *C, ARegion *ar, void *arg_info) ImageSampleInfo *info = arg_info; if (info->draw) { - ED_image_draw_info(scene, ar, info->color_manage, FALSE, info->channels, + ED_image_draw_info(scene, ar, info->color_manage, false, info->channels, info->x, info->y, info->col, info->colf, info->linearcol, info->zp, info->zfp); } @@ -425,19 +425,19 @@ bool ED_space_node_color_sample(SpaceNode *snode, ARegion *ar, int mval[2], floa Image *ima; ImBuf *ibuf; float fx, fy, bufx, bufy; - int ret = FALSE; + int ret = false; if (STREQ(snode->tree_idname, ntreeType_Composite->idname) || (snode->flag & SNODE_BACKDRAW) == 0) { /* use viewer image for color sampling only if we're in compositor tree * with backdrop enabled */ - return FALSE; + return false; } ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node"); ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock); if (!ibuf) { - return FALSE; + return false; } /* map the mouse coords to the backdrop image space */ @@ -458,12 +458,12 @@ bool ED_space_node_color_sample(SpaceNode *snode, ARegion *ar, int mval[2], floa fp = (ibuf->rect_float + (ibuf->channels) * (y * ibuf->x + x)); /* IB_PROFILE_NONE is default but infact its linear */ linearrgb_to_srgb_v3_v3(r_col, fp); - ret = TRUE; + ret = true; } else if (ibuf->rect) { cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x); rgb_uchar_to_float(r_col, cp); - ret = TRUE; + ret = true; } } @@ -531,7 +531,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event) copy_v4_v4(info->linearcol, info->colf); IMB_colormanagement_colorspace_to_scene_linear_v4(info->linearcol, false, ibuf->rect_colorspace); - info->color_manage = TRUE; + info->color_manage = true; } if (ibuf->rect_float) { fp = (ibuf->rect_float + (ibuf->channels) * (y * ibuf->x + x)); @@ -541,7 +541,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event) info->colf[2] = fp[2]; info->colf[3] = fp[3]; - info->color_manage = TRUE; + info->color_manage = true; } if (ibuf->zbuf) { diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index f7520d12bf6..e9531ea0020 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -828,7 +828,7 @@ void ED_spacetype_node(void) art->draw = node_main_area_draw; art->listener = node_region_listener; art->cursor = node_cursor; - art->event_cursor = TRUE; + art->event_cursor = true; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL; BLI_addhead(&st->regiontypes, art); |