diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_color.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 98672f2fca2..640e91adabf 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -57,9 +57,7 @@ #include "BKE_node.h" #include "BKE_sequencer.h" #include "BKE_texture.h" -#ifdef WITH_FREESTYLE -# include "BKE_linestyle.h" -#endif +#include "BKE_linestyle.h" #include "ED_node.h" @@ -188,20 +186,18 @@ static char *rna_ColorRamp_path(PointerRNA *ptr) break; } - default: - /* everything else just uses 'color_ramp' */ - path = BLI_strdup("color_ramp"); - break; - -#ifdef WITH_FREESTYLE case ID_LS: { - char *path = FRS_path_from_ID_to_color_ramp((FreestyleLineStyle *)id, (ColorBand *)ptr->data); + char *path = BKE_path_from_ID_to_color_ramp((FreestyleLineStyle *)id, (ColorBand *)ptr->data); if (path) return path; break; } -#endif + + default: + /* everything else just uses 'color_ramp' */ + path = BLI_strdup("color_ramp"); + break; } } else { @@ -273,13 +269,12 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr) } break; -#ifdef WITH_FREESTYLE case ID_LS: { ListBase listbase; LinkData *link; - FRS_list_modifier_color_ramps((FreestyleLineStyle *)id, &listbase); + BKE_list_modifier_color_ramps((FreestyleLineStyle *)id, &listbase); for (link = (LinkData *)listbase.first; link; link = link->next) { RNA_pointer_create(id, &RNA_ColorRamp, link->data, &ramp_ptr); COLRAMP_GETPATH; @@ -287,7 +282,6 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr) BLI_freelistN(&listbase); break; } -#endif default: /* everything else should have a "color_ramp" property */ { @@ -340,7 +334,6 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA * WM_main_add_notifier(NC_TEXTURE, tex); } break; -#ifdef WITH_FREESTYLE case ID_LS: { FreestyleLineStyle *linestyle= ptr->id.data; @@ -348,7 +341,6 @@ static void rna_ColorRamp_update(Main *bmain, Scene *UNUSED(scene), PointerRNA * WM_main_add_notifier(NC_LINESTYLE, linestyle); break; } -#endif default: break; } |