diff options
-rw-r--r-- | source/blender/editors/animation/fmodifier_ui.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 3 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 | ||||
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_colorcorrection.c | 10 | ||||
-rw-r--r-- | source/creator/creator.c | 48 |
6 files changed, 41 insertions, 28 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index b98e4e493ff..adea3bcdc31 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -138,7 +138,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s /* draw polynomial order selector */ row = uiLayoutRow(layout, FALSE); block = uiLayoutGetBlock(row); - but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5*UI_UNIT_X, 0, bwidth, UI_UNIT_Y, + but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5f * UI_UNIT_X, 0, bwidth, UI_UNIT_Y, &data->poly_order, 1, 100, 0, 0, TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)")); uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 14829569c25..e1a18158c2d 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2982,7 +2982,8 @@ static int vertex_group_vert_select_unlocked_poll(bContext *C) return 0; if (!(vgroup_object_in_edit_mode(ob) || - vgroup_object_in_wpaint_vert_select(ob))) { + vgroup_object_in_wpaint_vert_select(ob))) + { return 0; } diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index c274135786f..d9dc5648ae3 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1639,7 +1639,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; - if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW)) { + if (sima->flag & (SI_PREVSPACE | SI_FULLWINDOW)) { sima->flag &= ~SI_PREVSPACE; sima->flag &= ~SI_FULLWINDOW; ED_screen_full_prevspace(C, sa); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 46feea6a553..3b769761dfb 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1059,9 +1059,9 @@ static void outliner_buttons(const bContext *C, uiBlock *block, ARegion *ar, Spa dx = (int)UI_GetStringWidth(te->name); - if (dx < 5*UI_UNIT_X) dx = 5*UI_UNIT_X; + if (dx < 5 * UI_UNIT_X) dx = 5 * UI_UNIT_X; spx = te->xs + 1.8f * UI_UNIT_X; - if (spx + dx + 0.5f*UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f*UI_UNIT_X; + if (spx + dx + 0.5f * UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f * UI_UNIT_X; bt = uiDefBut(block, TEX, OL_NAMEBUTTON, "", spx, (int)te->ys, dx + UI_UNIT_X, UI_UNIT_Y - 1, (void *)te->name, 1.0, (float)len, 0, 0, ""); diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c index a6369aeb3a8..ad1e70423a5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c @@ -30,21 +30,19 @@ * \ingroup cmpnodes */ - - #include "node_composite_util.h" /* ******************* Color Balance ********************************* */ static bNodeSocketTemplate cmp_node_colorcorrection_in[] = { - { SOCK_RGBA,1,N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, + { SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, { SOCK_FLOAT, 1, N_("Mask"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, - { -1,0,""} + { -1, 0, ""} }; static bNodeSocketTemplate cmp_node_colorcorrection_out[] = { - { SOCK_RGBA,0,N_("Image")}, - { -1,0,""} + { SOCK_RGBA, 0, N_("Image")}, + { -1, 0, ""} }; static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode *node) diff --git a/source/creator/creator.c b/source/creator/creator.c index 04882f07cc3..84d23530800 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -249,12 +249,12 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) BLI_argsPrintArgDoc(ba, "--frame-jump"); BLI_argsPrintArgDoc(ba, "--render-output"); BLI_argsPrintArgDoc(ba, "--engine"); + BLI_argsPrintArgDoc(ba, "--threads"); printf("\n"); printf("Format Options:\n"); BLI_argsPrintArgDoc(ba, "--render-format"); BLI_argsPrintArgDoc(ba, "--use-extension"); - BLI_argsPrintArgDoc(ba, "--threads"); printf("\n"); printf("Animation Playback Options:\n"); @@ -266,26 +266,52 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) BLI_argsPrintArgDoc(ba, "--window-borderless"); BLI_argsPrintArgDoc(ba, "--window-geometry"); BLI_argsPrintArgDoc(ba, "--start-console"); + BLI_argsPrintArgDoc(ba, "--no-native-pixels"); + printf("\n"); printf("Game Engine Specific Options:\n"); BLI_argsPrintArgDoc(ba, "-g"); printf("\n"); - printf("Misc Options:\n"); + printf("Python Options:\n"); + BLI_argsPrintArgDoc(ba, "--enable-autoexec"); + BLI_argsPrintArgDoc(ba, "--disable-autoexec"); + + printf("\n"); + + BLI_argsPrintArgDoc(ba, "--python"); + BLI_argsPrintArgDoc(ba, "--python-text"); + BLI_argsPrintArgDoc(ba, "--python-console"); + BLI_argsPrintArgDoc(ba, "--addons"); + + + printf("\n"); + printf("Debug Options:\n"); BLI_argsPrintArgDoc(ba, "--debug"); - BLI_argsPrintArgDoc(ba, "--debug-fpe"); - BLI_argsPrintArgDoc(ba, "--disable-crash-handler"); + BLI_argsPrintArgDoc(ba, "--debug-value"); + printf("\n"); + BLI_argsPrintArgDoc(ba, "--debug-events"); #ifdef WITH_FFMPEG BLI_argsPrintArgDoc(ba, "--debug-ffmpeg"); #endif - + BLI_argsPrintArgDoc(ba, "--debug-handlers"); #ifdef WITH_LIBMV BLI_argsPrintArgDoc(ba, "--debug-libmv"); #endif + BLI_argsPrintArgDoc(ba, "--debug-jobs"); + BLI_argsPrintArgDoc(ba, "--debug-python"); + + BLI_argsPrintArgDoc(ba, "--debug-wm"); + BLI_argsPrintArgDoc(ba, "--debug-all"); + + printf("\n"); + BLI_argsPrintArgDoc(ba, "--debug-fpe"); + BLI_argsPrintArgDoc(ba, "--disable-crash-handler"); printf("\n"); + printf("Misc Options:\n"); BLI_argsPrintArgDoc(ba, "--factory-startup"); printf("\n"); BLI_argsPrintArgDoc(ba, "--env-system-config"); @@ -302,18 +328,6 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) BLI_argsPrintArgDoc(ba, "--help"); - printf("\n"); - - BLI_argsPrintArgDoc(ba, "--enable-autoexec"); - BLI_argsPrintArgDoc(ba, "--disable-autoexec"); - - printf("\n"); - - BLI_argsPrintArgDoc(ba, "--python"); - BLI_argsPrintArgDoc(ba, "--python-text"); - BLI_argsPrintArgDoc(ba, "--python-console"); - BLI_argsPrintArgDoc(ba, "--addons"); - #ifdef WIN32 BLI_argsPrintArgDoc(ba, "-R"); BLI_argsPrintArgDoc(ba, "-r"); |