[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50024] branches/soc-2011-tomato: Merging r50022 through r50023 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sun Aug 19 18:18:35 CEST 2012
Revision: 50024
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50024
Author: nazgul
Date: 2012-08-19 16:18:33 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Merging r50022 through r50023 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50023
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50021
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50023
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c 2012-08-19 15:56:49 UTC (rev 50023)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c 2012-08-19 16:18:33 UTC (rev 50024)
@@ -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);
}
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50021
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50023
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50021
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50023
Modified: branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c 2012-08-19 15:56:49 UTC (rev 50023)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c 2012-08-19 16:18:33 UTC (rev 50024)
@@ -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: branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c 2012-08-19 15:56:49 UTC (rev 50023)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c 2012-08-19 16:18:33 UTC (rev 50024)
@@ -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: branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h 2012-08-19 15:56:49 UTC (rev 50023)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h 2012-08-19 16:18:33 UTC (rev 50024)
@@ -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