Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-23 07:00:37 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-23 07:00:37 +0400
commit62cede96d34d802d97797a635ff8370a5f7556a1 (patch)
treeec56d7f332164b34c31607ed882218ce892c9319 /source/blender/editors/include/UI_resources.h
parent865e80f0f47b8cda1b126c2130114b833c7c5035 (diff)
A major code update for making the DNA file specification of Freestyle settings
and RNA for it independent of the build flag for enabling Freestyle. Suggested by Sergey Sharybin through a code review of the branch. * Many #ifdef WITH_FREESTYLE blocks were removed to always have Freestyle-specific DNA file specification and RNA for it built in Blender. This will allow Freestyle setting survive even when a non-Freestyle build is used for loading and saving files. It is noted that operations are still conditionally built through #ifdef WITH_FREESTYLE blocks. * To this end, new blenkernel files BKE_freestyle.h and intern/freestyle.c have been added. All API functions in FRS_freestyle_config.h as well as some of those in FRS_freestyle.h were moved to the new files. Now the relocated API functions have BKE_ prefix instead of FRS_.
Diffstat (limited to 'source/blender/editors/include/UI_resources.h')
-rw-r--r--source/blender/editors/include/UI_resources.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index fb4e9d2aa6e..308ca8c9355 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -208,10 +208,8 @@ enum {
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 */