[Bf-blender-cvs] [4bfc7b9e7d8] blender2.8: Fix crahs using ndof

Sergey Sharybin noreply at git.blender.org
Tue Jun 12 14:51:08 CEST 2018


Commit: 4bfc7b9e7d80c269921f7847732b7b7a3c3412e9
Author: Sergey Sharybin
Date:   Tue Jun 12 14:50:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4bfc7b9e7d80c269921f7847732b7b7a3c3412e9

Fix crahs using ndof

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

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 cdf2106d8bf..a7fb6071f4e 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1112,7 +1112,6 @@ static void view3d_ndof_pan_zoom(
 
 static void view3d_ndof_orbit(
         const struct wmNDOFMotionData *ndof, ScrArea *sa, ARegion *ar,
-        /* optional, can be NULL*/
         ViewOpsData *vod, const bool apply_dyn_ofs)
 {
 	View3D *v3d = sa->spacedata.first;
@@ -1445,7 +1444,7 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
 			ED_view3d_distance_set(rv3d, 0.0f);
 
 			if (has_rotation) {
-				view3d_ndof_orbit(ndof, vod->sa, vod->ar, NULL, false);
+				view3d_ndof_orbit(ndof, vod->sa, vod->ar, vod, false);
 			}
 
 			ED_view3d_distance_set(rv3d, dist_backup);



More information about the Bf-blender-cvs mailing list