Revision: 24911
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24911
Author: broken
Date: 2009-11-26 07:25:25 +0100 (Thu, 26 Nov 2009)
Log Message:
-----------
Fix for [#20042] There are remains of "Shaded" draw type in a panel
Removed references to shaded view now it's disabled
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-11-26
06:07:56 UTC (rev 24910)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-11-26
06:25:25 UTC (rev 24911)
@@ -10100,6 +10100,14 @@
ntree= ntree->id.next;
}
}
+ {
+ Object *ob=main->object.first;
+ while (ob) {
+ /* shaded mode disabled for now */
+ if (ob->dt == OB_SHADED) ob->dt = OB_TEXTURE;
+ ob=ob->id.next;
+ }
+ }
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-26
06:07:56 UTC (rev 24910)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-26
06:25:25 UTC (rev 24911)
@@ -1317,7 +1317,7 @@
{OB_BOUNDBOX, "BOUNDS", 0, "Bounds", ""},
{OB_WIRE, "WIRE", 0, "Wire", ""},
{OB_SOLID, "SOLID", 0, "Solid", ""},
- {OB_SHADED, "SHADED", 0, "Shaded", ""},
+ // disabled {OB_SHADED, "SHADED", 0, "Shaded", ""},
{OB_TEXTURE, "TEXTURED", 0, "Textured", ""},
{0, NULL, 0, NULL, NULL}};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
