diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2784a904753..48054604a25 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -43,6 +43,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 */ @@ -222,8 +223,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: @@ -576,8 +577,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; } } @@ -1593,6 +1594,7 @@ static void rna_def_object_modifiers(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "remove", "rna_Object_modifier_remove"); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Remove an existing modifier from the object."); + /* target to remove*/ parm= RNA_def_pointer(func, "modifier", "Modifier", "", "Modifier to remove."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); |