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/editors/interface/resources.c | |
| parent | 46f518e92790a04885f4e047bb59b11019d73aa3 (diff) | |
| parent | 2e2e6e3bdb694e56fcd161f06b6751e953cd2fa1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index bf42316289f..2eae452debb 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -46,10 +46,10 @@ #include "BLI_math.h" #include "BKE_appdir.h" +#include "BKE_colorband.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" #include "BKE_main.h" -#include "BKE_texture.h" #include "BIF_gl.h" @@ -2000,7 +2000,7 @@ void init_userdef_do_versions(void) rgba_char_args_set(btheme->tv3d.editmesh_active, 255, 255, 255, 128); } if (U.coba_weight.tot == 0) - init_colorband(&U.coba_weight, true); + BKE_colorband_init(&U.coba_weight, true); } if (!USER_VERSION_ATLEAST(245, 3)) { bTheme *btheme; |