[Bf-blender-cvs] [99e361f] soc-2014-shapekey: Addressing mont29's code review
Grigory Revzin
noreply at git.blender.org
Sun Jun 15 21:26:18 CEST 2014
Commit: 99e361ffd4bd2b877ae780f7579071aa25018a44
Author: Grigory Revzin
Date: Sun Jun 15 23:20:26 2014 +0400
https://developer.blender.org/rB99e361ffd4bd2b877ae780f7579071aa25018a44
Addressing mont29's code review
Also removed pointless #include "BKE_key.h" in transform_manipulator.c
===================================================================
M source/blender/blenkernel/BKE_crazyspace.h
M source/blender/blenkernel/intern/crazyspace.c
M source/blender/editors/transform/transform_manipulator.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h
index 67ec31f..968b64d3 100644
--- a/source/blender/blenkernel/BKE_crazyspace.h
+++ b/source/blender/blenkernel/BKE_crazyspace.h
@@ -34,10 +34,13 @@
#ifdef __cplusplus
extern "C" {
#endif
+
struct Scene;
struct Object;
struct BMEditMesh;
struct Mesh;
+struct BMEditSelection;
+struct DerivedMesh;
/* crazyspace.c */
float (*BKE_crazyspace_get_mapped_editverts(struct Scene *scene, struct Object *obedit))[3];
diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c
index 4b5a0bf..33484ae 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -481,8 +481,10 @@ void BKE_crazyspace_cage_active_sel_center(BMEditSelection *ese, DerivedMesh *ca
BMFace *f = (BMFace *)ese->ele;
BMVert *v;
BMIter iter;
- zero_v3(cent);
int total = 0, index;
+
+ zero_v3(cent);
+
BM_ITER_ELEM(v, &iter, f, BM_VERTS_OF_FACE) {
++total;
index = BM_elem_index_get(v);
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index edfb007..1c0e30c 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -57,7 +57,6 @@
#include "BKE_editmesh.h"
#include "BKE_lattice.h"
#include "BKE_DerivedMesh.h"
-#include "BKE_key.h"
#include "BKE_crazyspace.h"
#include "MEM_guardedalloc.h"
@@ -261,7 +260,7 @@ bool gimbal_axis(Object *ob, float gmat[3][3])
return 0;
}
-void calc_tw_center_dm(Scene *scene, BMVert *eve, MVert *dm_verts, int edit_vert_index, int *index_map)
+static void calc_tw_center_dm(Scene *scene, BMVert *eve, MVert *dm_verts, int edit_vert_index, int *index_map)
{
int derived_index;
@@ -307,12 +306,11 @@ int calc_manipulator_stats(const bContext *C)
BMEditSelection ese;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, scene->customdata_mask);
- dmverts = dm->getVertArray(dm);
-
float vec[3] = { 0, 0, 0 };
-
int *derived_index_map = NULL;
+ dmverts = dm->getVertArray(dm);
+
if (!BKE_crazyspace_cageindexes_in_sync(ob)) {
derived_index_map = BKE_crazyspace_map_em_to_cage(ob, em, dm);
}
More information about the Bf-blender-cvs
mailing list