[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49997] trunk/blender/source/blender/ editors/transform/transform_orientations.c: re-enable metaball orientation for manipulator and view axis setting ( was disabled since 2.4x)
Campbell Barton
ideasman42 at gmail.com
Sat Aug 18 23:12:08 CEST 2012
Revision: 49997
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49997
Author: campbellbarton
Date: 2012-08-18 21:12:08 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
re-enable metaball orientation for manipulator and view axis setting (was disabled since 2.4x)
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform_orientations.c
Modified: trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-08-18 20:54:43 UTC (rev 49996)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c 2012-08-18 21:12:08 UTC (rev 49997)
@@ -33,6 +33,7 @@
#include "DNA_armature_types.h"
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
+#include "DNA_meta_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
@@ -549,8 +550,8 @@
Object *ob = OBACT;
int result = ORIENTATION_NONE;
- normal[0] = normal[1] = normal[2] = 0;
- plane[0] = plane[1] = plane[2] = 0;
+ zero_v3(normal);
+ zero_v3(plane);
if (obedit) {
float imat[3][3], mat[3][3];
@@ -743,37 +744,20 @@
}
}
else if (obedit->type == OB_MBALL) {
-#if 0 // XXX
- /* editmball.c */
- MetaElem *ml, *ml_sel = NULL;
-
- /* loop and check that only one element is selected */
- for (ml = editelems.first; ml; ml = ml->next) {
- if (ml->flag & SELECT) {
- if (ml_sel == NULL) {
- ml_sel = ml;
- }
- else {
- ml_sel = NULL;
- break;
- }
- }
- }
+ MetaBall *mb = obedit->data;
- if (ml_sel) {
+ if (mb->lastelem) {
float mat[4][4];
/* Rotation of MetaElem is stored in quat */
- quat_to_mat4(mat, ml_sel->quat);
+ quat_to_mat4(mat, mb->lastelem->quat);
copy_v3_v3(normal, mat[2]);
negate_v3_v3(plane, mat[1]);
- result = ORIENTATION_NORMAL;
+ result = ORIENTATION_FACE;
}
-#endif
-
}
else if (obedit->type == OB_ARMATURE) {
bArmature *arm = obedit->data;
More information about the Bf-blender-cvs
mailing list