[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44032] branches/bmesh/blender/source/ blender: correct bad level include.
Campbell Barton
ideasman42 at gmail.com
Sat Feb 11 11:56:11 CET 2012
Revision: 44032
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44032
Author: campbellbarton
Date: 2012-02-11 10:56:07 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
correct bad level include.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
Modified: branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2012-02-11 10:50:48 UTC (rev 44031)
+++ branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c 2012-02-11 10:56:07 UTC (rev 44032)
@@ -22,10 +22,9 @@
#include "MEM_guardedalloc.h"
-
#include "BLI_math.h"
-#include "ED_mesh.h" /* XXX BAD LEVEL CALL */
+#include "ED_mesh.h"
#include "bmesh.h"
#include "bmesh_private.h"
Modified: branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2012-02-11 10:50:48 UTC (rev 44031)
+++ branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c 2012-02-11 10:56:07 UTC (rev 44032)
@@ -31,8 +31,7 @@
#include "DNA_object_types.h"
-#include "ED_mesh.h" /* XXX BAD LEVEL CALL */
-#include "mesh_intern.h" /* XXX EXTRA BAD LEVEL CALL - this is supposed to be internal! */
+#include "ED_mesh.h"
#include "bmesh.h"
#include "bmesh_private.h"
Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-11 10:50:48 UTC (rev 44031)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h 2012-02-11 10:56:07 UTC (rev 44032)
@@ -330,6 +330,16 @@
const short skip_em_vert_array_init);
void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store);
+#define SUBDIV_SELECT_ORIG 0
+#define SUBDIV_SELECT_INNER 1
+#define SUBDIV_SELECT_INNER_SEL 2
+#define SUBDIV_SELECT_LOOPCUT 3
+
+/* edge subdivide corner cut types */
+#define SUBDIV_CORNER_PATH 0
+#define SUBDIV_CORNER_INNERVERT 1
+#define SUBDIV_CORNER_FAN 2
+
#ifdef __cplusplus
}
#endif
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h 2012-02-11 10:50:48 UTC (rev 44031)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h 2012-02-11 10:56:07 UTC (rev 44032)
@@ -227,17 +227,7 @@
void MESH_OT_solidify(struct wmOperatorType *ot);
void MESH_OT_select_nth(struct wmOperatorType *ot);
void MESH_OT_select_next_loop(struct wmOperatorType *ot);
-
-#define SUBDIV_SELECT_ORIG 0
-#define SUBDIV_SELECT_INNER 1
-#define SUBDIV_SELECT_INNER_SEL 2
-#define SUBDIV_SELECT_LOOPCUT 3
-/* edge subdivide corner cut types */
-#define SUBDIV_CORNER_PATH 0
-#define SUBDIV_CORNER_INNERVERT 1
-#define SUBDIV_CORNER_FAN 2
-
extern struct EnumPropertyItem *corner_type_items;
#if 0 /* REMOVE AFTER BMESH MERGE */
More information about the Bf-blender-cvs
mailing list