[Bf-blender-cvs] [26133a9] master: Fix for VIEW3D_OT_camera_to_view with quadview, disable in camera view
Campbell Barton
noreply at git.blender.org
Thu Feb 27 01:34:51 CET 2014
Commit: 26133a96ae82f44de12c4952ddca07578ede752c
Author: Campbell Barton
Date: Thu Feb 27 11:33:27 2014 +1100
https://developer.blender.org/rB26133a96ae82f44de12c4952ddca07578ede752c
Fix for VIEW3D_OT_camera_to_view with quadview, disable in camera view
===================================================================
M source/blender/editors/space_view3d/view3d_view.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 0c3a2b8..83e4f11 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -408,10 +408,15 @@ void VIEW3D_OT_smoothview(wmOperatorType *ot)
static int view3d_camera_to_view_exec(bContext *C, wmOperator *UNUSED(op))
{
- View3D *v3d = CTX_wm_view3d(C);
- RegionView3D *rv3d = CTX_wm_region_view3d(C);
+ View3D *v3d;
+ ARegion *ar;
+ RegionView3D *rv3d;
+
ObjectTfmProtectedChannels obtfm;
+ ED_view3d_context_user_region(C, &v3d, &ar);
+ rv3d = ar->regiondata;
+
copy_qt_qt(rv3d->lviewquat, rv3d->viewquat);
rv3d->lview = rv3d->view;
if (rv3d->persp != RV3D_CAMOB) {
@@ -435,11 +440,17 @@ static int view3d_camera_to_view_exec(bContext *C, wmOperator *UNUSED(op))
static int view3d_camera_to_view_poll(bContext *C)
{
- View3D *v3d = CTX_wm_view3d(C);
- if (v3d && v3d->camera && v3d->camera->id.lib == NULL) {
- RegionView3D *rv3d = CTX_wm_region_view3d(C);
- if (rv3d && (rv3d->viewlock & RV3D_LOCKED) == 0) {
- return 1;
+ View3D *v3d;
+ ARegion *ar;
+
+ if (ED_view3d_context_user_region(C, &v3d, &ar)) {
+ RegionView3D *rv3d = ar->regiondata;
+ if (v3d && v3d->camera && v3d->camera->id.lib == NULL) {
+ if (rv3d && (rv3d->viewlock & RV3D_LOCKED) == 0) {
+ if (rv3d->persp != RV3D_CAMOB) {
+ return 1;
+ }
+ }
}
}
More information about the Bf-blender-cvs
mailing list