[Bf-blender-cvs] [0f94c99ee70] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Wed Mar 30 09:03:28 CEST 2022
Commit: 0f94c99ee70edbd306747bdad18c02d867ecd053
Author: Campbell Barton
Date: Wed Mar 30 18:02:59 2022 +1100
Branches: master
https://developer.blender.org/rB0f94c99ee70edbd306747bdad18c02d867ecd053
Cleanup: clang-format
===================================================================
M source/blender/editors/space_view3d/view3d_navigate_fly.c
M source/blender/editors/space_view3d/view3d_navigate_walk.c
M source/blender/editors/util/ed_util.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.c b/source/blender/editors/space_view3d/view3d_navigate_fly.c
index 5b817dc1f45..399f422f411 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_fly.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_fly.c
@@ -322,7 +322,8 @@ static bool initFlyInfo(bContext *C, FlyInfo *fly, wmOperator *op, const wmEvent
fly->rv3d->persp = RV3D_PERSP;
}
- if (fly->rv3d->persp == RV3D_CAMOB && !BKE_id_is_editable(CTX_data_main(C), &fly->v3d->camera->id)) {
+ if (fly->rv3d->persp == RV3D_CAMOB &&
+ !BKE_id_is_editable(CTX_data_main(C), &fly->v3d->camera->id)) {
BKE_report(op->reports,
RPT_ERROR,
"Cannot navigate a camera from an external library or non-editable override");
diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.c b/source/blender/editors/space_view3d/view3d_navigate_walk.c
index c842eba54b3..18ed88aeec6 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_walk.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_walk.c
@@ -504,7 +504,8 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
walk->rv3d->persp = RV3D_PERSP;
}
- if (walk->rv3d->persp == RV3D_CAMOB && !BKE_id_is_editable(CTX_data_main(C), &walk->v3d->camera->id)) {
+ if (walk->rv3d->persp == RV3D_CAMOB &&
+ !BKE_id_is_editable(CTX_data_main(C), &walk->v3d->camera->id)) {
BKE_report(op->reports,
RPT_ERROR,
"Cannot navigate a camera from an external library or non-editable override");
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index f125482460c..f07364cd4d3 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -126,7 +126,8 @@ void ED_editors_init(bContext *C)
continue;
}
/* Object mode is enforced for non-editable data (or their obdata). */
- if (!BKE_id_is_editable(bmain, &ob->id) || (ob_data != NULL && !BKE_id_is_editable(bmain, ob_data))) {
+ if (!BKE_id_is_editable(bmain, &ob->id) ||
+ (ob_data != NULL && !BKE_id_is_editable(bmain, ob_data))) {
continue;
}
More information about the Bf-blender-cvs
mailing list