Commit: 7395182ce353f6391f283018561a0719449b6e3b Author: Hans Goudey Date: Tue Jun 4 19:54:04 2019 -0400 Branches: soc-2019-bevel-profiles https://developer.blender.org/rB7395182ce353f6391f283018561a0719449b6e3b
Revert changes from 'make format' on files unrelated to branch =================================================================== M source/blender/editors/interface/interface_templates.c M source/blender/editors/screen/screen_ops.c M source/blender/editors/space_file/filesel.c M source/blender/editors/undo/ed_undo.c =================================================================== diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index e1d3bd736e7..5d25c778de1 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2447,6 +2447,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con) uiItemL(row, "", RNA_struct_ui_icon(ptr.type)); UI_block_emboss_set(block, UI_EMBOSS); + if (con->flag & CONSTRAINT_DISABLE) { uiLayoutSetRedAlert(row, true); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index a83eecd1a39..7c03ba889a7 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3601,12 +3601,8 @@ static int repeat_history_invoke(bContext *C, wmOperator *op, const wmEvent *UNU for (i = items - 1, lastop = wm->operators.last; lastop; lastop = lastop->prev, i--) { if ((lastop->type->flag & OPTYPE_REGISTER) && WM_operator_repeat_check(C, lastop)) { - uiItemIntO(layout, - WM_operatortype_name(lastop->type, lastop->ptr), - ICON_NONE, - op->type->idname, - "index", - i); + uiItemIntO( + layout, WM_operatortype_name(lastop->type, lastop->ptr), ICON_NONE, op->type->idname, "index", i); } } diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index fab3cfbb69d..c82e140e1fe 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -112,8 +112,7 @@ short ED_fileselect_set_params(SpaceFile *sfile) const bool is_directory = (RNA_struct_find_property(op->ptr, "directory") != NULL); const bool is_relative_path = (RNA_struct_find_property(op->ptr, "relative_path") != NULL); - BLI_strncpy_utf8( - params->title, WM_operatortype_name(op->type, op->ptr), sizeof(params->title)); + BLI_strncpy_utf8(params->title, WM_operatortype_name(op->type, op->ptr), sizeof(params->title)); if ((prop = RNA_struct_find_property(op->ptr, "filemode"))) { params->type = RNA_property_int_get(op->ptr, prop); diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index f254abcfe99..734cdc424d9 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -591,8 +591,7 @@ static int undo_history_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE const EnumPropertyItem *item = rna_undo_itemf(C, &totitem); if (totitem > 0) { - uiPopupMenu *pup = UI_popup_menu_begin( - C, WM_operatortype_name(op->type, op->ptr), ICON_NONE); + uiPopupMenu *pup = UI_popup_menu_begin(C, WM_operatortype_name(op->type, op->ptr), ICON_NONE); uiLayout *layout = UI_popup_menu_layout(pup); uiLayout *split = uiLayoutSplit(layout, 0.0f, false); uiLayout *column = NULL; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs