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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 09:24:14 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 09:24:14 +0300
commit41d4a1986548e66a652221e4a68c52900474eeff (patch)
tree26acf937ea0b762977f89adcc4e74a3ec9ecee62 /source/blender/windowmanager
parent108045faa01849115c54190ebed788faf36dcb56 (diff)
ClangFormat: format '#if 0' code in source/
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c4
-rw-r--r--source/blender/windowmanager/intern/wm_gesture.c24
-rw-r--r--source/blender/windowmanager/intern/wm_gesture_ops.c4
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c27
4 files changed, 41 insertions, 18 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index c31f78339a8..1cc45653087 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1716,7 +1716,9 @@ int WM_operator_call_py(bContext *C,
wm->op_undo_depth--;
}
else {
- CLOG_WARN(WM_LOG_OPERATORS, "\"%s\" operator has no exec function, Python cannot call it", op->type->name);
+ CLOG_WARN(WM_LOG_OPERATORS,
+ "\"%s\" operator has no exec function, Python cannot call it",
+ op->type->name);
}
#endif
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index b264f6a570d..1b2ecf4c1ab 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -165,14 +165,22 @@ int wm_gesture_evaluate(wmGesture *gesture)
#if 0
/* debug */
- if (val == 1) printf("tweak north\n");
- if (val == 2) printf("tweak north-east\n");
- if (val == 3) printf("tweak east\n");
- if (val == 4) printf("tweak south-east\n");
- if (val == 5) printf("tweak south\n");
- if (val == 6) printf("tweak south-west\n");
- if (val == 7) printf("tweak west\n");
- if (val == 8) printf("tweak north-west\n");
+ if (val == 1)
+ printf("tweak north\n");
+ if (val == 2)
+ printf("tweak north-east\n");
+ if (val == 3)
+ printf("tweak east\n");
+ if (val == 4)
+ printf("tweak south-east\n");
+ if (val == 5)
+ printf("tweak south\n");
+ if (val == 6)
+ printf("tweak south-west\n");
+ if (val == 7)
+ printf("tweak west\n");
+ if (val == 8)
+ printf("tweak north-west\n");
#endif
return val;
}
diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c
index 254ced02b26..00f9f078f91 100644
--- a/source/blender/windowmanager/intern/wm_gesture_ops.c
+++ b/source/blender/windowmanager/intern/wm_gesture_ops.c
@@ -449,7 +449,6 @@ void WM_OT_circle_gesture(wmOperatorType *ot)
/* properties */
WM_operator_properties_gesture_circle(ot);
-
}
#endif
@@ -726,8 +725,7 @@ const int (*WM_gesture_lasso_path_to_array(bContext *UNUSED(C),
static int gesture_lasso_exec(bContext *C, wmOperator *op)
{
- RNA_BEGIN (op->ptr, itemptr, "path")
- {
+ RNA_BEGIN (op->ptr, itemptr, "path") {
float loc[2];
RNA_float_get_array(&itemptr, "loc", loc);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 41cebec7e90..701aae20cd3 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -362,16 +362,15 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
for (link = lb.first; link; link = link->next) {
const char *identifier = link->data;
- PointerRNA ctx_item_ptr = {{0}}; // CTX_data_pointer_get(C, identifier); // XXX, this isnt working
+ PointerRNA ctx_item_ptr = {
+ {0}}; // CTX_data_pointer_get(C, identifier); // XXX, this isnt working
if (ctx_item_ptr.type == NULL) {
continue;
}
if (ptr->id.data == ctx_item_ptr.id.data) {
- if ((ptr->data == ctx_item_ptr.data) &&
- (ptr->type == ctx_item_ptr.type))
- {
+ if ((ptr->data == ctx_item_ptr.data) && (ptr->type == ctx_item_ptr.type)) {
/* found! */
member_found = identifier;
break;
@@ -801,7 +800,20 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg)
BLI_assert(search_menu->use_previews ||
(search_menu->prv_cols == 0 && search_menu->prv_rows == 0));
#if 0 /* ok, this isn't so easy... */
- uiDefBut(block, UI_BTYPE_LABEL, 0, RNA_struct_ui_name(op->type->srna), 10, 10, UI_searchbox_size_x(), UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
+ uiDefBut(block,
+ UI_BTYPE_LABEL,
+ 0,
+ RNA_struct_ui_name(op->type->srna),
+ 10,
+ 10,
+ UI_searchbox_size_x(),
+ UI_UNIT_Y,
+ NULL,
+ 0.0,
+ 0.0,
+ 0,
+ 0,
+ "");
#endif
but = uiDefSearchButO_ptr(block,
op->type,
@@ -3722,7 +3734,10 @@ const EnumPropertyItem *RNA_action_itemf(bContext *C,
C, ptr, r_free, C ? (ID *)CTX_data_main(C)->actions.first : NULL, false, NULL, NULL);
}
#if 0 /* UNUSED */
-const EnumPropertyItem *RNA_action_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
+const EnumPropertyItem *RNA_action_local_itemf(bContext *C,
+ PointerRNA *ptr,
+ PropertyRNA *UNUSED(prop),
+ bool *r_free)
{
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, true);
}