[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37091] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: fix [#27557] Linked object (camera) should not be able to set position by using camera to view operator
Campbell Barton
ideasman42 at gmail.com
Thu Jun 2 10:55:27 CEST 2011
Revision: 37091
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37091
Author: campbellbarton
Date: 2011-06-02 08:55:26 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
fix [#27557] Linked object (camera) should not be able to set position by using camera to view operator
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 2011-06-02 08:45:28 UTC (rev 37090)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-06-02 08:55:26 UTC (rev 37091)
@@ -391,12 +391,15 @@
static int view3d_setcameratoview_poll(bContext *C)
{
- View3D *v3d = CTX_wm_view3d(C);
- RegionView3D *rv3d= CTX_wm_region_view3d(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) {
+ return 1;
+ }
+ }
- if (v3d==NULL || v3d->camera==NULL) return 0;
- if (rv3d && rv3d->viewlock != 0) return 0;
- return 1;
+ return 0;
}
void VIEW3D_OT_setcameratoview(wmOperatorType *ot)
More information about the Bf-blender-cvs
mailing list