blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: style

This commit is contained in:
Campbell Barton 2018-11-03 15:55:33 +11:00
parent 4affea081a
commit a18927463c
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/curve/editcurve.c
View File

@ -2400,7 +2400,7 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
Curve *cu = obedit->data;
if (!ED_curve_select_check(v3d, cu->editnurb)) {
continue;
continue;
}
EditNurb *editnurb = cu->editnurb;
@ -4462,7 +4462,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
if (!(nu1->flagu & CU_NURB_CYCLIC) && nu1->pntsu > 1) {
if (nu1->type == CU_BEZIER && BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, nu1->bezt) &&
BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, &nu1->bezt[nu1->pntsu - 1]))
BEZT_ISSEL_ANY_HIDDENHANDLES(v3d, &nu1->bezt[nu1->pntsu - 1]))
{
nu1->flagu |= CU_NURB_CYCLIC;
BKE_nurb_handles_calc(nu1);

6
source/blender/editors/include/UI_interface.h
View File

@ -1043,7 +1043,7 @@ void uiTemplateIDBrowse(
void uiTemplateIDPreview(
uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname,
const char *newop, const char *openop, const char *unlinkop, int rows, int cols,
int filter, const bool hide_buttons);
int filter, const bool hide_buttons);
void uiTemplateIDTabs(
uiLayout *layout, struct bContext *C,
PointerRNA *ptr, const char *propname,
@ -1069,8 +1069,8 @@ void uiTemplatePathBuilder(
uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
uiLayout *uiTemplateGpencilModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
void uiTemplateGpencilColorPreview(
uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname,
int rows, int cols, float scale, int filter);
uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname,
int rows, int cols, float scale, int filter);
uiLayout *uiTemplateShaderFx(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);

16
source/blender/editors/interface/interface_templates.c
View File

@ -746,12 +746,16 @@ static void template_ID(
}
}
if (user_alert) UI_but_flag_enable(but, UI_BUT_REDALERT);
if (user_alert) {
UI_but_flag_enable(but, UI_BUT_REDALERT);
}
if (id->lib == NULL && !(ELEM(GS(id->name), ID_GR, ID_SCE, ID_SCR, ID_TXT, ID_OB, ID_WS)) &&
(hide_buttons == false))
(hide_buttons == false))
{
uiDefIconButR(block, UI_BTYPE_ICON_TOGGLE, 0, ICON_FAKE_USER_OFF, 0, 0, UI_UNIT_X, UI_UNIT_Y, &idptr, "use_fake_user", -1, 0, 0, -1, -1, NULL);
uiDefIconButR(
block, UI_BTYPE_ICON_TOGGLE, 0, ICON_FAKE_USER_OFF, 0, 0, UI_UNIT_X, UI_UNIT_Y,
&idptr, "use_fake_user", -1, 0, 0, -1, -1, NULL);
}
}
@ -945,8 +949,8 @@ static void ui_template_id(
else {
uiLayoutRow(layout, true);
template_ID(
C, layout, template_ui, type, flag, newop, openop,
unlinkop, live_icon, hide_buttons);
C, layout, template_ui, type, flag, newop, openop,
unlinkop, live_icon, hide_buttons);
}
}
@ -979,7 +983,7 @@ void uiTemplateIDBrowse(
void uiTemplateIDPreview(
uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, const char *newop,
const char *openop, const char *unlinkop, int rows, int cols, int filter,
const bool hide_buttons)
const bool hide_buttons)
{
ui_template_id(
layout, C, ptr, propname,