[Bf-blender-cvs] [dd73d9c] master: Correct error in recent smoothview edits

Campbell Barton noreply at git.blender.org
Thu May 5 11:55:07 CEST 2016


Commit: dd73d9c54e90187735997a52b728b5fd64987129
Author: Campbell Barton
Date:   Thu May 5 19:58:03 2016 +1000
Branches: master
https://developer.blender.org/rBdd73d9c54e90187735997a52b728b5fd64987129

Correct error in recent smoothview edits

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 0c05e85..9ee00d2 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1649,10 +1649,10 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 		viewops_data_alloc(C, op);
 		viewops_data_create_ex(C, op, event,
 		                       (U.uiflag & USER_ORBIT_SELECTION) != 0, false);
+		vod = op->customdata;
 
 		ED_view3d_smooth_view_force_finish(C, vod->v3d, vod->ar);
 
-		vod = op->customdata;
 		v3d = vod->v3d;
 		rv3d = vod->rv3d;
 
@@ -1718,9 +1718,10 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 		viewops_data_create_ex(C, op, event,
 		                       (U.uiflag & USER_ORBIT_SELECTION) != 0, false);
 
+		vod = op->customdata;
+
 		ED_view3d_smooth_view_force_finish(C, vod->v3d, vod->ar);
 
-		vod = op->customdata;
 		v3d = vod->v3d;
 		rv3d = vod->rv3d;




More information about the Bf-blender-cvs mailing list