1 files changed, 15 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c
index fbf586e3f49..a252329b635 100644
--- a/source/blender/blenkernel/intern/paint_toolslots.c
+++ b/source/blender/blenkernel/intern/paint_toolslots.c
@@ -67,11 +67,21 @@ void BKE_paint_toolslots_init_from_main(struct Main *bmain)
   for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
     ToolSettings *ts = scene->toolsettings;
     paint_toolslots_init(bmain, &ts->imapaint.paint);
-    paint_toolslots_init(bmain, &ts->sculpt->paint);
-    paint_toolslots_init(bmain, &ts->vpaint->paint);
-    paint_toolslots_init(bmain, &ts->wpaint->paint);
-    paint_toolslots_init(bmain, &ts->uvsculpt->paint);
-    paint_toolslots_init(bmain, &ts->gp_paint->paint);
+    if (ts->sculpt) {
+      paint_toolslots_init(bmain, &ts->sculpt->paint);
+    }
+    if (ts->vpaint) {
+      paint_toolslots_init(bmain, &ts->vpaint->paint);
+    }
+    if (ts->wpaint) {
+      paint_toolslots_init(bmain, &ts->wpaint->paint);
+    }
+    if (ts->uvsculpt) {
+      paint_toolslots_init(bmain, &ts->uvsculpt->paint);
+    }
+    if (ts->gp_paint) {
+      paint_toolslots_init(bmain, &ts->gp_paint->paint);
+    }
   }
 }