[Bf-blender-cvs] [da712608038] asset-greasepencil: Merge branch 'master' into asset-greasepencil

[Antonio Vazquez]

Commit: da712608038fca11037f8e95709d94500b5448f0
Author: Antonio Vazquez
Date:   Tue Apr 5 11:40:24 2022 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBda712608038fca11037f8e95709d94500b5448f0

Merge branch 'master' into asset-greasepencil

 Conflicts:
	source/blender/blenkernel/intern/icons.cc
	source/blender/editors/gpencil/CMakeLists.txt

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



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

diff --cc source/blender/blenkernel/intern/icons.cc
index 2b682536259,2ba6510ee71..1f0a9f58ec7
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@@ -417,7 -416,7 +417,7 @@@ void BKE_previewimg_id_custom_set(ID *i
  
  bool BKE_previewimg_id_supports_jobs(const ID *id)
  {
-   return ELEM(GS(id->name), ID_OB, ID_MA, ID_TE, ID_LA, ID_WO, ID_IM, ID_BR, ID_GD);
 -  return ELEM(GS(id->name), ID_OB, ID_MA, ID_TE, ID_LA, ID_WO, ID_IM, ID_BR, ID_GR);
++  return ELEM(GS(id->name), ID_OB, ID_MA, ID_TE, ID_LA, ID_WO, ID_IM, ID_BR, ID_GR, ID_GD);
  }
  
  void BKE_previewimg_deferred_release(PreviewImage *prv)
diff --cc source/blender/editors/gpencil/CMakeLists.txt
index 5ba7b06bb5f,09a3cac0d48..13624d09a2e
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@@ -28,8 -28,7 +28,8 @@@ set(SR
    gpencil_add_monkey.c
    gpencil_add_stroke.c
    gpencil_armature.c
 +  gpencil_asset.c
-   gpencil_bake_animation.c
+   gpencil_bake_animation.cc
    gpencil_convert.c
    gpencil_data.c
    gpencil_edit.c