[Bf-blender-cvs] [456d5e14b84] master: Merge branch 'blender-v3.0-release'

[Julian Eisel]

Commit: 456d5e14b841c5feb2a3e145a3d6ab12925c630b
Author: Julian Eisel
Date:   Mon Nov 22 21:26:39 2021 +0100
Branches: master
https://developer.blender.org/rB456d5e14b841c5feb2a3e145a3d6ab12925c630b

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/icons.cc
index ffc39028400,9cf289935ab..c2250dd04f9
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@@ -374,17 -364,17 +365,18 @@@ PreviewImage **BKE_previewimg_id_get_p(
      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;