diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 00:56:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 01:00:05 +0300 |
| commit | e103618b281f4783b43b080d46e78f52fa2198db (patch) | |
| tree | c723e1a6d5456826a4c650abea3dce321d7ad3a5 /source/blender/editors/interface/resources.c | |
| parent | 07ab3eec01f812bffccb4e60f532b53ff198f4c8 (diff) | |
Cleanup: move cycles addon check out of versioning
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c9967aa880a..983f1944116 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -43,6 +43,7 @@ #include "BLI_utildefines.h" #include "BLI_math.h" +#include "BKE_addon.h" #include "BKE_appdir.h" #include "BKE_main.h" #include "BKE_mesh_runtime.h" @@ -1199,5 +1200,13 @@ void init_userdef_do_versions(Main *bmain) /* signal for evaluated mesh to use colorband */ /* run in case this was on and is now off in the user prefs [#28096] */ - BKE_mesh_runtime_color_band_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight) : NULL, UI_GetTheme()->tv3d.vertex_unreferenced); + BKE_mesh_runtime_color_band_store( + (U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight) : NULL, + UI_GetTheme()->tv3d.vertex_unreferenced); + + /* Not versioning, just avoid errors. */ +#ifndef WITH_CYCLES + BKE_addon_remove_safe(&U.addons, "cycles"); +#endif + } |