svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / makesrna / intern / rna_object.c

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 9305380d06cb7f861796d00a19b2195aefda10f2..b411ea75d4e518a5a9f2911d1980deb30ca19426 100644 (file)
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -48,6 +48,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_meta_types.h"
 
+#include "BKE_tessmesh.h"
 #include "BKE_group.h" /* needed for object_in_group() */
 
 #include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
@@ -227,8 +228,8 @@ void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr)
                /* exit/enter editmode to get new shape */
                switch(ob->type) {
                        case OB_MESH:
-                               load_editMesh(scene, ob);
-                               make_editMesh(scene, ob);
+                               EDBM_LoadEditBMesh(scene, ob);
+                               EDBM_MakeEditBMesh(scene->toolsettings, scene, ob);
                                break;
                        case OB_CURVE:
                        case OB_SURF:
@@ -586,8 +587,8 @@ static void rna_Object_active_material_index_set(PointerRNA *ptr, int value)
        if(ob->type==OB_MESH) {
                Mesh *me= ob->data;
 
-               if(me->edit_mesh)
-                       me->edit_mesh->mat_nr= value;
+               if(me->edit_btmesh)
+                       me->edit_btmesh->mat_nr= value;
        }
 }