[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53538] branches/soc-2008-mxcurioni/source /blender: Hid the Misc panel in the Freestyle Line Style tab for now.

[Tamito Kajiyama]

Revision: 53538
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53538
Author:   kjym3
Date:     2013-01-03 23:47:53 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
Hid the Misc panel in the Freestyle Line Style tab for now.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c

Modified: branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c	2013-01-03 23:27:20 UTC (rev 53537)
+++ branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c	2013-01-03 23:47:53 UTC (rev 53538)
@@ -8668,6 +8668,12 @@
 			}
 		}
 		for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+#if 1
+			/* disable the Misc panel for now */
+			if (linestyle->panel == LS_PANEL_MISC) {
+				linestyle->panel = LS_PANEL_STROKES;
+			}
+#endif
 			if (linestyle->thickness_position == 0) {
 				linestyle->thickness_position = LS_THICKNESS_CENTER;
 				linestyle->thickness_ratio = 0.5f;

Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c	2013-01-03 23:27:20 UTC (rev 53537)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c	2013-01-03 23:47:53 UTC (rev 53538)
@@ -877,7 +877,9 @@
 		{LS_PANEL_ALPHA, "ALPHA", 0, "Alpha", "Show the panel for alpha transparency options"},
 		{LS_PANEL_THICKNESS, "THICKNESS", 0, "Thickness", "Show the panel for line thickness options"},
 		{LS_PANEL_GEOMETRY, "GEOMETRY", 0, "Geometry", "Show the panel for stroke geometry options"},
+#if 0 /* hidden for now */
 		{LS_PANEL_MISC, "MISC", 0, "Misc", "Show the panel for miscellaneous options"},
+#endif
 		{0, NULL, 0, NULL, NULL}
 	};
 	static EnumPropertyItem chaining_items[] = {