diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 15:53:03 +0300 |
| commit | 1c7cfa025c87e8f31790b48cbb189949f7949ad1 (patch) | |
| tree | 3869d475a9d10c005b0bb8006eb77bf55f1903d3 /source/blender/makesrna/intern/rna_material.c | |
| parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
| parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index a2845b3a2f8..440af0d0e8e 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -85,6 +85,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { #include "DNA_screen_types.h" #include "DNA_space_types.h" +#include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_main.h" #include "BKE_material.h" @@ -323,7 +324,7 @@ static void rna_Material_use_diffuse_ramp_set(PointerRNA *ptr, int value) else ma->mode &= ~MA_RAMP_COL; if ((ma->mode & MA_RAMP_COL) && ma->ramp_col == NULL) - ma->ramp_col = add_colorband(false); + ma->ramp_col = BKE_colorband_add(false); } static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value) @@ -334,7 +335,7 @@ static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value) else ma->mode &= ~MA_RAMP_SPEC; if ((ma->mode & MA_RAMP_SPEC) && ma->ramp_spec == NULL) - ma->ramp_spec = add_colorband(false); + ma->ramp_spec = BKE_colorband_add(false); } static void rna_Material_use_nodes_update(bContext *C, PointerRNA *ptr) |