blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2022-03-30 18:02:59 +11:00
parent a8ec7845e0
commit 0f94c99ee7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/space_view3d/view3d_navigate_fly.c
View File

@ -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");

3
source/blender/editors/space_view3d/view3d_navigate_walk.c
View File

@ -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");

3
source/blender/editors/util/ed_util.c
View File

@ -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;
}