Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-06-05 15:30:44 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-06-05 15:30:44 +0300
commita73b250fc5fbaa6e087c3999fa66a19e9f4efaa0 (patch)
treed5b0aebf66491fa6bb653f6fc29a0acf32b3fd40 /source/blender
parenteeda9369b6e63e38a82292f0b42eefc8247e4348 (diff)
Code Style: Make Format
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/interface/interface_templates.c1
-rw-r--r--source/blender/editors/screen/screen_ops.c8
-rw-r--r--source/blender/editors/space_file/filesel.c3
-rw-r--r--source/blender/editors/undo/ed_undo.c3
-rw-r--r--source/blender/makesrna/intern/rna_constraint.c4
5 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 5d25c778de1..e1d3bd736e7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2447,7 +2447,6 @@ 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 b3cbeca7317..37d9dd80f1a 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3598,8 +3598,12 @@ 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 c82e140e1fe..fab3cfbb69d 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -112,7 +112,8 @@ 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 734cdc424d9..f254abcfe99 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -591,7 +591,8 @@ 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;
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index f0d76c2e405..cf2a9878a37 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -1641,7 +1641,7 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna)
RNA_def_struct_ui_text(srna, "Follow Path Constraint", "Lock motion to the target path");
RNA_def_struct_sdna_from(srna, "bFollowPathConstraint", "data");
RNA_def_struct_ui_icon(srna, ICON_CON_FOLLOWPATH);
-
+
prop = RNA_def_property(srna, "target", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "tar");
RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Curve_object_poll");
@@ -2351,7 +2351,7 @@ static void rna_def_constraint_distance_limit(BlenderRNA *brna)
RNA_def_struct_sdna_from(srna, "bDistLimitConstraint", "data");
RNA_def_struct_ui_icon(srna, ICON_CON_DISTLIMIT);
-
+
rna_def_constraint_target_common(srna);
prop = RNA_def_property(srna, "distance", PROP_FLOAT, PROP_DISTANCE);