[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34535] trunk/blender/source/blender: More logical ordering of Empty draw types.
Daniel Salazar
zanqdo at gmail.com
Thu Jan 27 22:05:02 CET 2011
Revision: 34535
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34535
Author: zanqdo
Date: 2011-01-27 21:05:01 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
More logical ordering of Empty draw types. Made Plain Axes default for
new empties
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-01-27 19:49:43 UTC (rev 34534)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-01-27 21:05:01 UTC (rev 34535)
@@ -1019,7 +1019,7 @@
unit_m4(ob->parentinv);
unit_m4(ob->obmat);
ob->dt= OB_TEXTURE;
- ob->empty_drawtype= OB_ARROWS;
+ ob->empty_drawtype= OB_PLAINAXES;
ob->empty_drawsize= 1.0;
if(type==OB_CAMERA || type==OB_LAMP) {
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2011-01-27 19:49:43 UTC (rev 34534)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2011-01-27 21:05:01 UTC (rev 34535)
@@ -385,10 +385,10 @@
#define OB_DRAWTRANSP 128
/* empty_drawtype: no flags */
-#define OB_ARROWS 1
-#define OB_PLAINAXES 2
-#define OB_CIRCLE 3
-#define OB_SINGLE_ARROW 4
+#define OB_PLAINAXES 1
+#define OB_ARROWS 2
+#define OB_SINGLE_ARROW 3
+#define OB_CIRCLE 4
#define OB_CUBE 5
#define OB_EMPTY_SPHERE 6
#define OB_EMPTY_CONE 7
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-01-27 19:49:43 UTC (rev 34534)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-01-27 21:05:01 UTC (rev 34535)
@@ -1675,9 +1675,9 @@
PropertyRNA *prop;
static EnumPropertyItem empty_drawtype_items[] = {
+ {OB_PLAINAXES, "PLAIN_AXES", 0, "Plain Axes", ""},
{OB_ARROWS, "ARROWS", 0, "Arrows", ""},
{OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""},
- {OB_PLAINAXES, "PLAIN_AXES", 0, "Plain Axes", ""},
{OB_CIRCLE, "CIRCLE", 0, "Circle", ""},
{OB_CUBE, "CUBE", 0, "Cube", ""},
{OB_EMPTY_SPHERE, "SPHERE", 0, "Sphere", ""},
More information about the Bf-blender-cvs
mailing list