Merge branch 'blender-v3.0-release'

1 files changed, 12 insertions, 20 deletions

diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc
index ffc39028400..c2250dd04f9 100644
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@ -360,31 +360,23 @@ void BKE_previewimg_id_copy(ID *new_id, const ID *old_id)
 PreviewImage **BKE_previewimg_id_get_p(const ID *id)
 {
   switch (GS(id->name)) {
-    case ID_OB: {
-      Object *ob = (Object *)id;
-      /* Currently, only object types with real geometry can be rendered as preview. */
-      if (!OB_TYPE_IS_GEOMETRY(ob->type)) {
-        return nullptr;
-      }
-      return &ob->preview;
-    }
-
 #define ID_PRV_CASE(id_code, id_struct) \
   case id_code: { \
     return &((id_struct *)id)->preview; \
   } \
     ((void)0)
-      ID_PRV_CASE(ID_MA, Material);
-      ID_PRV_CASE(ID_TE, Tex);
-      ID_PRV_CASE(ID_WO, World);
-      ID_PRV_CASE(ID_LA, Light);
-      ID_PRV_CASE(ID_IM, Image);
-      ID_PRV_CASE(ID_BR, Brush);
-      ID_PRV_CASE(ID_GR, Collection);
-      ID_PRV_CASE(ID_SCE, Scene);
-      ID_PRV_CASE(ID_SCR, bScreen);
-      ID_PRV_CASE(ID_AC, bAction);
-      ID_PRV_CASE(ID_NT, bNodeTree);
+    ID_PRV_CASE(ID_OB, Object);
+    ID_PRV_CASE(ID_MA, Material);
+    ID_PRV_CASE(ID_TE, Tex);
+    ID_PRV_CASE(ID_WO, World);
+    ID_PRV_CASE(ID_LA, Light);
+    ID_PRV_CASE(ID_IM, Image);
+    ID_PRV_CASE(ID_BR, Brush);
+    ID_PRV_CASE(ID_GR, Collection);
+    ID_PRV_CASE(ID_SCE, Scene);
+    ID_PRV_CASE(ID_SCR, bScreen);
+    ID_PRV_CASE(ID_AC, bAction);
+    ID_PRV_CASE(ID_NT, bNodeTree);
 #undef ID_PRV_CASE
     default:
       break;