diff options
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 6 |
4 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 267e7c05737..8ba86673f87 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -62,10 +62,6 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -if(WITH_FREESTYLE) - add_definitions(-DWITH_FREESTYLE) -endif() - if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) endif() diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 16e4e6cb9c0..8d277d6cd35 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -42,9 +42,6 @@ defs = [] if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') -if env['WITH_BF_FREESTYLE']: - defs.append('WITH_FREESTYLE') - if env['WITH_BF_PYTHON']: defs.append('WITH_PYTHON') diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f376d42e7a8..30d360363c6 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -334,9 +334,7 @@ static const char *template_id_browse_tip(StructRNA *type) case ID_MA: return N_("Browse Material to be linked"); case ID_TE: return N_("Browse Texture to be linked"); case ID_IM: return N_("Browse Image to be linked"); -#ifdef WITH_FREESTYLE case ID_LS: return N_("Browse Line Style Data to be linked"); -#endif case ID_LT: return N_("Browse Lattice Data to be linked"); case ID_LA: return N_("Browse Lamp Data to be linked"); case ID_CA: return N_("Browse Camera Data to be linked"); @@ -372,9 +370,7 @@ static const char *template_id_context(StructRNA *type) case ID_MA: return BLF_I18NCONTEXT_ID_MATERIAL; case ID_TE: return BLF_I18NCONTEXT_ID_TEXTURE; case ID_IM: return BLF_I18NCONTEXT_ID_IMAGE; -#ifdef WITH_FREESTYLE case ID_LS: return BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE; -#endif case ID_LT: return BLF_I18NCONTEXT_ID_LATTICE; case ID_LA: return BLF_I18NCONTEXT_ID_LAMP; case ID_CA: return BLF_I18NCONTEXT_ID_CAMERA; @@ -532,9 +528,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str BLF_I18NCONTEXT_ID_BRUSH, BLF_I18NCONTEXT_ID_PARTICLESETTINGS, BLF_I18NCONTEXT_ID_GPENCIL, -#ifdef WITH_FREESTYLE - BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE -#endif + BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE, ); if (newop) { diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 658d89abea3..288b8b43e82 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -361,12 +361,10 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo cp = ts->handle_sel_vect; break; case TH_HANDLE_SEL_ALIGN: cp = ts->handle_sel_align; break; -#ifdef WITH_FREESTYLE case TH_FREESTYLE_EDGE_MARK: cp = ts->freestyle_edge_mark; break; case TH_FREESTYLE_FACE_MARK: cp = ts->freestyle_face_mark; break; -#endif case TH_SYNTAX_B: cp = ts->syntaxb; break; @@ -768,10 +766,8 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tv3d.button_text_hi, 255, 255, 255, 255); rgba_char_args_set(btheme->tv3d.button_title, 0, 0, 0, 255); rgba_char_args_set(btheme->tv3d.title, 0, 0, 0, 255); -#ifdef WITH_FREESTYLE rgba_char_args_set(btheme->tv3d.freestyle_edge_mark, 0x7f, 0xff, 0x7f, 255); rgba_char_args_set(btheme->tv3d.freestyle_face_mark, 0x7f, 0xff, 0x7f, 51); -#endif btheme->tv3d.facedot_size = 4; @@ -2030,7 +2026,6 @@ void init_userdef_do_versions(void) } } -#ifdef WITH_FREESTYLE /* Freestyle color settings */ { bTheme *btheme; @@ -2043,7 +2038,6 @@ void init_userdef_do_versions(void) } } } -#endif /* GL Texture Garbage Collection (variable abused above!) */ if (U.textimeout == 0) { |