2.5

Put back Armature/Pose code, including 'heat weight'.
I've added reeb.h to get things compile, but Martin will
cleanup files and put back?

Now where to put all vertexgroup code.... I guess mesh?

Note for msvc: yep, another new dir to add! :)

5 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index a572013e849..e1a358a9e06 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -74,6 +74,7 @@
 
 #include "ED_mesh.h"
 #include "ED_object.h"
+#include "ED_view3d.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -108,7 +109,6 @@ static int sample_backbuf() {return 0;}
 static void BIF_undo_push() {}
 static void error() {}
 static int pupmenu() {return 0;}
-static void *give_cursor() {return NULL;}
 /* ***************** XXX **************** */
 
 
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 9104e133cc6..b7ffe65d6ef 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -79,6 +79,7 @@
 
 #include "ED_mesh.h"
 #include "ED_util.h"
+#include "ED_view3d.h"
 
 /* own include */
 #include "mesh_intern.h"
diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index 974528626d0..de6cd14b453 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -55,6 +55,7 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data
 #include "BKE_utildefines.h"
 
 #include "ED_mesh.h"
+#include "ED_view3d.h"
 
 #include "mesh_intern.h"
 
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index a1ee2475fd2..75bfc1eb244 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -55,6 +55,7 @@
 
 #include "ED_screen.h"
 #include "ED_mesh.h"
+#include "ED_view3d.h"
 
 #include "mesh_intern.h"
 
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 29c11e69a67..1c95103bcc9 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -82,6 +82,7 @@
 
 #include "ED_mesh.h"
 #include "ED_object.h"
+#include "ED_view3d.h"
 
 /* own include */
 #include "mesh_intern.h"