[Bf-committers] Freestyle branch breaks color theme

[IRIE Shinsuke]

Hi,

In Freestyle build, some UI are shown with incorrect colors.
See screenshot:

http://www.pasteall.org/pic/42776

For example, manipulator is red arrow + two black arrows, and selected
outliner items are black (unreadable!).

I confirmed the following patch fixes this issue.

= = = = = = = = = = = = = = = S T A R T = = = = = = = = = = = = = = =
Index: source/blender/editors/include/UI_resources.h
===================================================================
--- source/blender/editors/include/UI_resources.h	(revision 53485)
+++ source/blender/editors/include/UI_resources.h	(working copy)
@@ -200,11 +200,6 @@
 	TH_STITCH_PREVIEW_UNSTITCHABLE,
 	TH_STITCH_PREVIEW_ACTIVE,
 
-#ifdef WITH_FREESTYLE
-	TH_FREESTYLE_EDGE_MARK,
-	TH_FREESTYLE_FACE_MARK,
-#endif
-
 	TH_MATCH,           /* highlight color for search matches */
 	TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */
 
@@ -225,7 +220,12 @@
 	
 	TH_AXIS_X,		/* X/Y/Z Axis */
 	TH_AXIS_Y,
-	TH_AXIS_Z
+	TH_AXIS_Z,
+
+#ifdef WITH_FREESTYLE
+	TH_FREESTYLE_EDGE_MARK,
+	TH_FREESTYLE_FACE_MARK,
+#endif
 };
 /* XXX WARNING: previous is saved in file, so do not change order! */
 
= = = = = = = = = = = = = = = E   N   D = = = = = = = = = = = = = = =

r53384
Ubuntu 12.10 amd64

-- 
IRIE Shinsuke