[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37665] branches/merwin-spacenav/source/ blender/editors/space_view3d/view3d_edit.c: Compile fix.

Nathan Letwory nathan at letworyinteractive.com
Mon Jun 20 15:04:12 CEST 2011


Revision: 37665
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37665
Author:   jesterking
Date:     2011-06-20 13:04:11 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
Compile fix. Note that var introduction must happen at start of code block.

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c

Modified: branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c	2011-06-20 12:43:10 UTC (rev 37664)
+++ branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c	2011-06-20 13:04:11 UTC (rev 37665)
@@ -952,11 +952,13 @@
 // Mike's version
 static int viewndof_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
+	RegionView3D* rv3d = CTX_wm_region_view3d(C);
 	wmNDOFMotionData* ndof = (wmNDOFMotionData*) event->customdata;
 
 	float sensitivity = 1.f; /* ooh, magic number!
 	const float sensitivity = 0.035; /* ooh, magic number!
 		there will be several of these as interactions get tuned */
+	int /* bool */ has_rotation = rv3d->viewlock != RV3D_LOCKED && (ndof->rx || ndof->ry || ndof->rz);
 
 	float dt = ndof->dt;
 	if (dt > 0.25f)
@@ -964,9 +966,7 @@
 		/* TODO: replace such guesswork with a flag or field from the NDOF manager */
 		dt = 0.0125f;
 
-	RegionView3D* rv3d = CTX_wm_region_view3d(C);
 
-	int /* bool */ has_rotation = rv3d->viewlock != RV3D_LOCKED && (ndof->rx || ndof->ry || ndof->rz);
 	if (has_rotation)
 		rv3d->view = RV3D_VIEW_USER;
 




More information about the Bf-blender-cvs mailing list