[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23767] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: bugfix - [#19563] Select camera+ctrl alt 0 crash
Campbell Barton
ideasman42 at gmail.com
Sun Oct 11 01:50:18 CEST 2009
Revision: 23767
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23767
Author: campbellbarton
Date: 2009-10-11 01:50:15 +0200 (Sun, 11 Oct 2009)
Log Message:
-----------
bugfix - [#19563] Select camera+ctrl alt 0 crash
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-10-10 23:15:52 UTC (rev 23766)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-10-10 23:50:15 UTC (rev 23767)
@@ -411,6 +411,7 @@
RegionView3D *rv3d= CTX_wm_region_view3d(C);
setcameratoview3d(v3d, rv3d, v3d->camera);
+ rv3d->persp = V3D_CAMOB;
WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, CTX_data_scene(C));
@@ -418,6 +419,16 @@
}
+int view3d_setcameratoview_poll(bContext *C)
+{
+ View3D *v3d = CTX_wm_view3d(C);
+ RegionView3D *rv3d= CTX_wm_region_view3d(C);
+
+ if (v3d==NULL || v3d->camera==NULL) return 0;
+ if (rv3d && rv3d->viewlock != 0) return 0;
+ return 1;
+}
+
void VIEW3D_OT_setcameratoview(wmOperatorType *ot)
{
@@ -428,7 +439,7 @@
/* api callbacks */
ot->exec= view3d_setcameratoview_exec;
- ot->poll= ED_operator_view3d_active;
+ ot->poll= view3d_setcameratoview_poll;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
More information about the Bf-blender-cvs
mailing list