griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5:

Browse Source 
* Updated object mode flags with Object and Edit.
* Updated RNA for that property
This commit is contained in:
Nicholas Bishop
2009-08-16 02:49:37 +00:00
parent abcdc909eb
commit c0718d2d4a
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/object/object_edit.c
View File

@@ -3732,6 +3732,7 @@ void ED_object_exit_editmode(bContext *C, int flag)
WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene);
}
obedit->mode &= ~OB_MODE_EDIT;
ED_object_toggle_modes(C, obedit->restore_mode);
}
@@ -3768,6 +3769,8 @@ void ED_object_enter_editmode(bContext *C, int flag)
ob->restore_mode = ob->mode;
ED_object_toggle_modes(C, ob->mode);
ob->mode |= OB_MODE_EDIT;
if(ob->type==OB_MESH) {
Mesh *me= ob->data;

13
source/blender/makesdna/DNA_object_types.h
View File

@@ -512,12 +512,13 @@ extern Object workob;
#define OB_LOCK_SCALE 448
/* ob->mode */
#define OB_MODE_NONE 0
#define OB_MODE_SCULPT 1
#define OB_MODE_VERTEX_PAINT 2
#define OB_MODE_WEIGHT_PAINT 4
#define OB_MODE_TEXTURE_PAINT 8
#define OB_MODE_PARTICLE_EDIT 16
#define OB_MODE_OBJECT 0
#define OB_MODE_EDIT 1
#define OB_MODE_SCULPT 2
#define OB_MODE_VERTEX_PAINT 4
#define OB_MODE_WEIGHT_PAINT 8
#define OB_MODE_TEXTURE_PAINT 16
#define OB_MODE_PARTICLE_EDIT 32
/* ob->softflag in DNA_object_force.h */

4
source/blender/makesrna/intern/rna_object.c
View File

@@ -969,9 +969,13 @@ static void rna_def_object(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem mode_items[] = {
{OB_MODE_OBJECT, "OBJECT", 0, "Object", ""},
{OB_MODE_EDIT, "EDIT", 0, "Edit", ""},
{OB_MODE_SCULPT, "SCULPT", 0, "Sculpt", ""},
{OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", 0, "Vertex Paint", ""},
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", 0, "Weight Paint", ""},
{OB_MODE_WEIGHT_PAINT, "TEXTURE_PAINT", 0, "Texture Paint", ""},
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", 0, "Particle Edit", ""},
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem empty_drawtype_items[] = {