From b222863336a86e772bcf5d7e1007a72f6667d53b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 23 May 2011 02:53:30 +0000 Subject: fix [#27459] Flymode moves parent for durian we had camera rigs which needed to have the parent transformed rather then the camera, for this reason I made fly mode fly the parent rather then the camera its self. Make this a preference and use this for view camera/view locking too. --- source/blender/editors/space_view3d/view3d_fly.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/view3d_fly.c') diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index e140ec39bf3..fdee5c6f6d9 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -307,7 +307,7 @@ static int initFlyInfo (bContext *C, FlyInfo *fly, wmOperator *op, wmEvent *even fly->dist_backup= fly->rv3d->dist; if (fly->rv3d->persp==RV3D_CAMOB) { Object *ob_back; - if((fly->root_parent=fly->v3d->camera->parent)) { + if((U.uiflag & USER_CAM_LOCK_NO_PARENT)==0 && (fly->root_parent=fly->v3d->camera->parent)) { while(fly->root_parent->parent) fly->root_parent= fly->root_parent->parent; ob_back= fly->root_parent; -- cgit v1.2.3