svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / makesrna / intern / rna_scene.c
index 662ce04552e952374e392a5529361f4ea6b63a88..904f4cc1b2fbd00a2f0f842c384aa50d940a2c4a 100644 (file)
@@ -40,6 +40,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
+#include "BKE_tessmesh.h"
+
 /* Include for Bake Options */
 #include "RE_pipeline.h"
 
@@ -856,9 +858,9 @@ static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value
 
                if(scene->basact) {
                        Mesh *me= get_mesh(scene->basact->object);
-                       if(me && me->edit_mesh && me->edit_mesh->selectmode != flag) {
-                               me->edit_mesh->selectmode= flag;
-                               EM_selectmode_set(me->edit_mesh);
+                       if(me && me->edit_btmesh && me->edit_btmesh->selectmode != flag) {
+                               me->edit_btmesh->selectmode= flag;
+                               EDBM_selectmode_set(me->edit_btmesh);
                        }
                }
        }
@@ -870,7 +872,7 @@ static void rna_Scene_editmesh_select_mode_update(Main *UNUSED(bmain), Scene *sc
 
        if(scene->basact) {
                me= get_mesh(scene->basact->object);
-               if(me && me->edit_mesh==NULL)
+               if(me && me->edit_btmesh==NULL)
                        me= NULL;
        }