[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45869] trunk/blender/source/blender: - fix for python freeing its own bmesh clearing the global mirror cache.
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 06:24:18 CEST 2012
Revision: 45869
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45869
Author: campbellbarton
Date: 2012-04-23 04:24:11 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
- fix for python freeing its own bmesh clearing the global mirror cache.
- fix for own mistake (Ctrl+T didnt set beauty peroperty).
- remove bad level includes in bmesh.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/bmesh/SConscript
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.h
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-04-23 04:24:11 UTC (rev 45869)
@@ -28,7 +28,6 @@
.
../blenkernel
../blenlib
- ../editors/include
../makesdna
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/bmesh/SConscript
===================================================================
--- trunk/blender/source/blender/bmesh/SConscript 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/SConscript 2012-04-23 04:24:11 UTC (rev 45869)
@@ -8,13 +8,11 @@
sources += env.Glob('tools/*.c')
incs = [
- '#/intern/guardedalloc',
+ './',
'../blenlib',
- '../blenloader',
'../makesdna',
'../blenkernel',
- './',
- '../editors/include',
+ '#/intern/guardedalloc',
]
defs = []
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -39,8 +39,6 @@
#include "BKE_tessmesh.h"
#include "BKE_multires.h"
-#include "ED_mesh.h"
-
#include "intern/bmesh_private.h"
/* used as an extern, defined in bmesh.h */
@@ -142,12 +140,6 @@
BLI_mempool_destroy(bm->looplistpool);
#endif
- /* These tables aren't used yet, so it's not strictly necessary
- * to 'end' them (with 'e' param) but if someone tries to start
- * using them, having these in place will save a lot of pain */
- mesh_octree_table(NULL, NULL, NULL, 'e');
- mesh_mirrtopo_table(NULL, 'e');
-
BLI_freelistN(&bm->selected);
BMO_error_clear(bm);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.h 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.h 2012-04-23 04:24:11 UTC (rev 45869)
@@ -39,6 +39,13 @@
SUBD_STRAIGHT_CUT
};
+enum {
+ SUBDIV_SELECT_ORIG,
+ SUBDIV_SELECT_INNER,
+ SUBDIV_SELECT_INNER_SEL,
+ SUBDIV_SELECT_LOOPCUT
+};
+
/* similar face selection slot values */
enum {
SIMFACE_MATERIAL = 201,
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -445,6 +445,7 @@
/* must have valid index data */
BLI_assert((bm->elem_index_dirty & BM_VERT) == 0);
+ (void)bm;
/* common cases first */
switch (f->len) {
Modified: trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_primitive.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/operators/bmo_primitive.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -28,8 +28,6 @@
#include "BLI_math.h"
-#include "ED_mesh.h"
-
#include "bmesh.h"
#include "intern/bmesh_private.h"
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -35,8 +35,6 @@
#include "DNA_object_types.h"
-#include "ED_mesh.h"
-
#include "bmesh.h"
#include "intern/bmesh_private.h"
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2012-04-23 04:24:11 UTC (rev 45869)
@@ -271,11 +271,6 @@
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
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -150,7 +150,7 @@
BKE_report(op->reports, RPT_ERROR, errmsg);
}
- BMEdit_Free(em);
+ EDBM_mesh_free(em);
*em = *emcopy;
MEM_freeN(emcopy);
@@ -284,7 +284,7 @@
if (me->edit_btmesh) {
/* this happens when switching shape keys */
- BMEdit_Free(me->edit_btmesh);
+ EDBM_mesh_free(me->edit_btmesh);
MEM_freeN(me->edit_btmesh);
}
@@ -315,9 +315,18 @@
#endif
}
-void EDBM_mesh_free(BMEditMesh *tm)
+/**
+ * Should only be called on the active editmesh, otherwise call #BMEdit_Free
+ */
+void EDBM_mesh_free(BMEditMesh *em)
{
- BMEdit_Free(tm);
+ /* These tables aren't used yet, so it's not strictly necessary
+ * to 'end' them (with 'e' param) but if someone tries to start
+ * using them, having these in place will save a lot of pain */
+ mesh_octree_table(NULL, NULL, NULL, 'e');
+ mesh_mirrtopo_table(NULL, 'e');
+
+ BMEdit_Free(em);
}
void EDBM_index_arrays_init(BMEditMesh *tm, int forvert, int foredge, int forface)
@@ -547,7 +556,7 @@
ob->shapenr = em->bm->shapenr;
- BMEdit_Free(em);
+ EDBM_mesh_free(em);
bm = BM_mesh_create(&bm_mesh_allocsize_default);
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -314,7 +314,8 @@
WM_keymap_add_item(keymap, "MESH_OT_fill", FKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_beautify_fill", FKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
- WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
+ kmi = WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
+ RNA_boolean_set(kmi->ptr, "use_beauty", TRUE);
kmi = WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "use_beauty", FALSE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -39,11 +39,6 @@
#include "DNA_object_types.h"
#include "DNA_modifier_types.h"
-/* #include "BLO_sys_types.h" *//* needed for intptr_t used in ED_mesh.h */
-
-/* #include "ED_mesh.h" */
-
-
#ifdef RNA_RUNTIME
#include "BLI_math.h"
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c 2012-04-23 03:43:02 UTC (rev 45868)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c 2012-04-23 04:24:11 UTC (rev 45869)
@@ -31,9 +31,6 @@
#include <string.h>
#include "RNA_define.h"
-
-#include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
-
#include "RNA_access.h"
#include "RNA_define.h"
More information about the Bf-blender-cvs
mailing list