[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40135] branches/cycles/source/blender: * Remove last occurrences of the OB_SHADED flag.

[Thomas Dinges]

Revision: 40135
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40135
Author:   dingto
Date:     2011-09-11 21:41:30 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
* Remove last occurrences of the OB_SHADED flag.

Modified Paths:
--------------
    branches/cycles/source/blender/makesdna/DNA_view3d_types.h
    branches/cycles/source/blender/makesrna/intern/rna_object.c
    branches/cycles/source/blender/makesrna/intern/rna_space.c

Modified: branches/cycles/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- branches/cycles/source/blender/makesdna/DNA_view3d_types.h	2011-09-11 19:57:38 UTC (rev 40134)
+++ branches/cycles/source/blender/makesdna/DNA_view3d_types.h	2011-09-11 21:41:30 UTC (rev 40135)
@@ -168,8 +168,8 @@
 	int layact;
 	
 	/**
-	 * The drawing mode for the 3d display. Set to OB_WIRE, OB_SOLID,
-	 * OB_SHADED or OB_TEXTURE */
+	 * The drawing mode for the 3d display. Set to OB_BOUNDBOX, OB_WIRE, OB_SOLID,
+	 * OB_TEXTURE, OB_MATERIAL or OB_RENDER */
 	short drawtype;
 	short ob_centre_cursor;		/* optional bool for 3d cursor to define center */
 	short scenelock, around;

Modified: branches/cycles/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_object.c	2011-09-11 19:57:38 UTC (rev 40134)
+++ branches/cycles/source/blender/makesrna/intern/rna_object.c	2011-09-11 21:41:30 UTC (rev 40135)
@@ -1739,7 +1739,6 @@
 		{OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Draw the bounding box of the object"},
 		{OB_WIRE, "WIRE", 0, "Wire", "Draw the object as a wireframe"},
 		{OB_SOLID, "SOLID", 0, "Solid", "Draw the object as a solid (If solid drawing is enabled in the viewport)"},
-		// disabled {OB_SHADED, "SHADED", 0, "Shaded", ""},
 		{OB_TEXTURE, "TEXTURED", 0, "Textured", "Draw the object with textures (If textures are enabled in the viewport)"},
 		{0, NULL, 0, NULL, NULL}};
 

Modified: branches/cycles/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_space.c	2011-09-11 19:57:38 UTC (rev 40134)
+++ branches/cycles/source/blender/makesrna/intern/rna_space.c	2011-09-11 21:41:30 UTC (rev 40135)
@@ -101,7 +101,6 @@
 	{OB_BOUNDBOX, "BOUNDBOX", ICON_BBOX, "Bounding Box", "Display the object's local bounding boxes only"},
 	{OB_WIRE, "WIREFRAME", ICON_WIRE, "Wireframe", "Display the object as wire edges"},
 	{OB_SOLID, "SOLID", ICON_SOLID, "Solid", "Display the object solid, lit with default OpenGL lights"},
-	//{OB_SHADED, "SHADED", ICON_SMOOTH, "Shaded", "Display the object solid, with preview shading interpolated at vertices"},
 	{OB_TEXTURE, "TEXTURED", ICON_POTATO, "Texture", "Display the object solid, with a texture"},
 	{OB_MATERIAL, "MATERIAL", ICON_MATERIAL_DATA, "Material", "Display objects solid, with GLSL material"},
 	{OB_RENDER, "RENDERED", ICON_SMOOTH, "Rendered", "Display render preview"},