[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22493] branches/blender2.5/blender/source /blender: 2.5:

[Nicholas Bishop]

Revision: 22493
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22493
Author:   nicholasbishop
Date:     2009-08-16 04:49:37 +0200 (Sun, 16 Aug 2009)

Log Message:
-----------
2.5:

* Updated object mode flags with Object and Edit.
* Updated RNA for that property

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-08-16 02:43:06 UTC (rev 22492)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-08-16 02:49:37 UTC (rev 22493)
@@ -3732,6 +3732,7 @@
 		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 @@
 
 	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;

Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h	2009-08-16 02:43:06 UTC (rev 22492)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h	2009-08-16 02:49:37 UTC (rev 22493)
@@ -512,12 +512,13 @@
 #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 */
 

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c	2009-08-16 02:43:06 UTC (rev 22492)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c	2009-08-16 02:49:37 UTC (rev 22493)
@@ -969,9 +969,13 @@
 		{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[] = {