[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50023] trunk/blender/source/blender: - fix for error in ndof patch.
Campbell Barton
ideasman42 at gmail.com
Sun Aug 19 17:56:49 CEST 2012
Revision: 50023
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50023
Author: campbellbarton
Date: 2012-08-19 15:56:49 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
- fix for error in ndof patch.
- ColorBalanceModifierData wasn't aligned on 32bit systems.
- BM_vert_find_first_loop() was missing NULL check.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-08-19 15:44:59 UTC (rev 50022)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-08-19 15:56:49 UTC (rev 50023)
@@ -202,6 +202,10 @@
return NULL;
e = bmesh_disk_faceedge_find_first(v->e, v);
+
+ if (!e)
+ return NULL;
+
return bmesh_radial_faceloop_find_first(e->l, v);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-08-19 15:44:59 UTC (rev 50022)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-08-19 15:56:49 UTC (rev 50023)
@@ -1022,9 +1022,10 @@
/* tune these until everything feels right */
const float rot_sensitivity = 1.f;
+#if 0
const float zoom_sensitivity = 1.f;
+#endif
const float pan_sensitivity = 1.f;
-
const int has_rotation = rv3d->viewlock != RV3D_LOCKED && !is_zero_v3(ndof->rvec);
float view_inv[4];
@@ -1249,13 +1250,12 @@
View3D *v3d = CTX_wm_view3d(C);
wmNDOFMotionData *ndof = (wmNDOFMotionData *) event->customdata;
- ED_view3d_camera_lock_init(v3d, rv3d);
-
viewops_data_create(C, op, event);
vod = op->customdata;
rv3d = vod->rv3d;
-
+ ED_view3d_camera_lock_init(v3d, rv3d);
+
if (ndof->progress != P_FINISHING) {
const float dt = ndof->dt;
@@ -1271,11 +1271,13 @@
float pan_vec[3];
const float rot_sensitivity = 1.f;
+#if 0
const float zoom_sensitivity = 1.f;
const float pan_sensitivity = 1.f;
float rot[4];
+ float angle = rot_sensitivity * ndof_to_axis_angle(ndof, axis);
float axis[3];
- float angle = rot_sensitivity * ndof_to_axis_angle(ndof, axis);
+#endif
if (U.ndof_flag & NDOF_PANX_INVERT_AXIS)
pan_vec[0] = -lateral_sensitivity * ndof->tvec[0];
Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c 2012-08-19 15:44:59 UTC (rev 50022)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c 2012-08-19 15:56:49 UTC (rev 50023)
@@ -84,22 +84,22 @@
/* return codes for select, and drawing flags */
-#define MAN_TRANS_X 1
-#define MAN_TRANS_Y 2
-#define MAN_TRANS_Z 4
-#define MAN_TRANS_C 7
+#define MAN_TRANS_X (1 << 0)
+#define MAN_TRANS_Y (1 << 1)
+#define MAN_TRANS_Z (1 << 2)
+#define MAN_TRANS_C (MAN_TRANS_X | MAN_TRANS_Y | MAN_TRANS_Z)
-#define MAN_ROT_X 8
-#define MAN_ROT_Y 16
-#define MAN_ROT_Z 32
-#define MAN_ROT_V 64
-#define MAN_ROT_T 128
-#define MAN_ROT_C 248
+#define MAN_ROT_X (1 << 3)
+#define MAN_ROT_Y (1 << 4)
+#define MAN_ROT_Z (1 << 5)
+#define MAN_ROT_V (1 << 6)
+#define MAN_ROT_T (1 << 7)
+#define MAN_ROT_C (MAN_ROT_X | MAN_ROT_Y | MAN_ROT_Z | MAN_ROT_V | MAN_ROT_T)
-#define MAN_SCALE_X 256
-#define MAN_SCALE_Y 512
-#define MAN_SCALE_Z 1024
-#define MAN_SCALE_C 1792
+#define MAN_SCALE_X (1 << 8)
+#define MAN_SCALE_Y (1 << 9)
+#define MAN_SCALE_Z (1 << 10)
+#define MAN_SCALE_C (MAN_SCALE_X | MAN_SCALE_Y | MAN_SCALE_Z)
/* color codes */
Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-08-19 15:44:59 UTC (rev 50022)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-08-19 15:56:49 UTC (rev 50023)
@@ -252,7 +252,6 @@
StripColorBalance color_balance;
float color_multiply;
- int pad;
} ColorBalanceModifierData;
typedef struct CurvesModifierData {
More information about the Bf-blender-cvs
mailing list