[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53497] branches/soc-2008-mxcurioni/source /blender/editors/include/UI_resources.h: Fix for theme colors not correctly applied to the user interface.

[Tamito Kajiyama]

Revision: 53497
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53497
Author:   kjym3
Date:     2013-01-02 01:20:19 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Fix for theme colors not correctly applied to the user interface.

This commit partly reverts the changes in revision 53197 for
making Freestyle optional.  Specifically #ifdef WITH_FREESTYLE
was removed from source/blender/editors/include/UI_resources.h so
that Freestyle-related theme properties are always defined
regardless of whether Freestyle is enabled or not.  This is in
line with the fact that Freestyle-related DNA components are
always defined no matter how a build is configured.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53197

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h

Modified: branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h	2013-01-02 00:29:09 UTC (rev 53496)
+++ branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h	2013-01-02 01:20:19 UTC (rev 53497)
@@ -200,10 +200,10 @@
 	TH_STITCH_PREVIEW_UNSTITCHABLE,
 	TH_STITCH_PREVIEW_ACTIVE,
 
-#ifdef WITH_FREESTYLE
+/* #ifdef WITH_FREESTYLE */
 	TH_FREESTYLE_EDGE_MARK,
 	TH_FREESTYLE_FACE_MARK,
-#endif
+/* #endif */
 
 	TH_MATCH,           /* highlight color for search matches */
 	TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */