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

[Antonio Vazquez]

Commit: 86363894b2309f56f230ec878fddab128a62ac76
Author: Antonio Vazquez
Date:   Wed Jul 21 10:08:48 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rB86363894b2309f56f230ec878fddab128a62ac76

Merge branch 'master' into asset-greasepencil

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



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

diff --cc source/blender/editors/render/render_preview.c
index bd755ad9645,36ca7718c7a..15c656af314
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@@ -693,11 -715,9 +717,11 @@@ void ED_preview_draw(const bContext *C
  struct ObjectPreviewData {
    /* The main for the preview, not of the current file. */
    Main *pr_main;
-   /* Copy of the object to create the preview for. The copy is for thread safety (and to insert it
-    * into an own main). */
+   /* Copy of the object to create the preview for. The copy is for thread safety (and to insert
+    * it into an own main). */
    Object *object;
 +  /* Datablock copy. Can be NULL. */
 +  ID *datablock;
    int sizex;
    int sizey;
  };