Commit: 53ae7384a687b3995585d2f49695816babc93f85
Author: Bastien Montagne
Date: Mon Nov 10 14:19:52 2014 +0100
Branches: soc-2014-shapekey
https://developer.blender.org/rB53ae7384a687b3995585d2f49695816babc93f85
Merge branch 'master' into soc-2014-shapekey
Conflicts:
source/blender/editors/mesh/editmesh_utils.c
===================================================================
===================================================================
diff --cc source/blender/editors/mesh/editmesh_utils.c
index 472561b,807f603..719fd73
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@@ -31,9 -31,9 +31,10 @@@
#include "MEM_guardedalloc.h"
+#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_types.h"
+ #include "DNA_key_types.h"
#include "BLI_math.h"
#include "BLI_alloca.h"
@@@ -391,7 -383,13 +391,13 @@@ void EDBM_mesh_load(Object *ob
Mesh *me = ob->data;
BMesh *bm = me->edit_btmesh->bm;
+ /* Workaround for T42360, 'ob->shapenr' should be 1 in this case.
+ * however this isn't synchronized between objects at the moment. */
+ if (UNLIKELY((ob->shapenr == 0) && (me->key &&
!BLI_listbase_is_empty(&me->key->block)))) {
+ bm->shapenr = 1;
+ }
+
- BM_mesh_bm_to_me(bm, me, false);
+ BM_mesh_bm_to_me(bm, me, false, true);
#ifdef USE_TESSFACE_DEFAULT
BKE_mesh_tessface_calc(me);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
