diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-02 05:20:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-02 05:20:19 +0400 |
| commit | 520ab93465d8056bf6d4a4115743daaee4c2fd66 (patch) | |
| tree | 374bf5f15efc848b18d12ae52db51639e5aad5bd /source/blender/editors/include/UI_resources.h | |
| parent | 4e5e5412efe8d55d8b36b09a112bcdb026309e6c (diff) | |
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.
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index b32bc1c2815..236cc371d8b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -200,10 +200,10 @@ enum { 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 */ |