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

[Antonio Vazquez]

Commit: 1979c48ffc679aa93b0856cf247a466417604ea8
Author: Antonio Vazquez
Date:   Wed Dec 15 18:38:10 2021 +0100
Branches: asset-greasepencil
https://developer.blender.org/rB1979c48ffc679aa93b0856cf247a466417604ea8

Merge branch 'master' into asset-greasepencil

 Conflicts:
	source/blender/blenkernel/intern/icons.cc

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



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

diff --cc source/blender/blenkernel/BKE_gpencil.h
index 089649d2a02,a483d482bd5..6d469b0df7a
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -170,8 -320,12 +320,13 @@@ struct bGPDcurve *BKE_gpencil_stroke_ed
  #define GPENCIL_ALPHA_OPACITY_THRESH 0.001f
  #define GPENCIL_STRENGTH_MIN 0.003f
  
+ /**
+  * Check if the given layer is able to be edited or not.
+  * \param gpl: Grease pencil layer
+  * \return True if layer is editable
+  */
  bool BKE_gpencil_layer_is_editable(const struct bGPDlayer *gpl);
 +void BKE_gpencil_frame_min_max(const struct bGPdata *gpd, int *r_min, int *r_max);
  
  /* How gpencil_layer_getframe() should behave when there
   * is no existing GP-Frame on the frame requested.
diff --cc source/blender/blenkernel/intern/gpencil.c
index b5edfab7b26,13338f33bd6..9b1cbc82b45
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -523,14 -506,8 +519,10 @@@ void BKE_gpencil_free_data(bGPdata *gpd
      /* clear cache */
      BKE_gpencil_batch_cache_free(gpd);
    }
 +  /* Preview. */
 +  BKE_previewimg_free(&gpd->preview);
  }
  
- /**
-  * Delete grease pencil evaluated data
-  * \param gpd_eval: Grease pencil data-block
-  */
  void BKE_gpencil_eval_delete(bGPdata *gpd_eval)
  {
    BKE_gpencil_free_data(gpd_eval, true);
diff --cc source/blender/blenkernel/intern/icons.cc
index c52e172b95b,059caaa27f9..1589f902447
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@@ -374,18 -361,18 +361,19 @@@ 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_GD, bGPdata);
-       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_GD, bGPdata);
+     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;