Merge branch 'master' into asset-greasepencil

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

release/scripts/startup/bl_ui/space_view3d.py

@@ -934,6 +934,7 @@ class VIEW3D_MT_editor_menus(Menu):
                 layout.menu("VIEW3D_MT_edit_gpencil")
                 layout.menu("VIEW3D_MT_edit_gpencil_stroke")
                 layout.menu("VIEW3D_MT_edit_gpencil_point")
+                layout.menu("VIEW3D_MT_edit_gpencil_asset")
             elif obj and obj.mode == 'WEIGHT_GPENCIL':
                 layout.menu("VIEW3D_MT_weight_gpencil")
             if obj and obj.mode == 'VERTEX_GPENCIL':
@@ -5167,6 +5168,21 @@ class VIEW3D_MT_edit_gpencil_point(Menu):
         layout.menu("VIEW3D_MT_gpencil_vertex_group")
 
 
+class VIEW3D_MT_edit_gpencil_asset(Menu):
+    bl_label = "Asset"
+
+    def draw(self, _context):
+        layout = self.layout
+
+        layout.operator("gpencil.asset_create", text="Active Layer").mode = 'LAYER'
+        layout.operator("gpencil.asset_create", text="All Layers").mode = 'LAYERS_ALL'
+        layout.operator("gpencil.asset_create", text="All Layers Separated").mode = 'LAYERS_SPLIT'
+        layout.operator("gpencil.asset_create", text="Active Frame (Active Layer)").mode = 'FRAME'
+        layout.operator("gpencil.asset_create", text="Active Frame (All Layers)").mode = 'FRAME_ALL'
+        layout.operator("gpencil.asset_create", text="Selected Frames").mode = 'FRAME_SELECTED'
+        layout.operator("gpencil.asset_create", text="Selected Strokes").mode = 'SELECTED'
+
+
 class VIEW3D_MT_weight_gpencil(Menu):
     bl_label = "Weights"
 
@@ -7299,6 +7315,10 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu):
 
             col.operator("gpencil.reproject", text="Reproject")
 
+        # Assets
+        col.separator()
+        col.operator_menu_enum("gpencil.asset_create", "mode", text="Create Asset")
+
 
 def draw_gpencil_layer_active(context, layout):
     gpl = context.active_gpencil_layer
@@ -7826,6 +7846,7 @@ classes = (
     VIEW3D_MT_edit_gpencil,
     VIEW3D_MT_edit_gpencil_stroke,
     VIEW3D_MT_edit_gpencil_point,
+    VIEW3D_MT_edit_gpencil_asset,
     VIEW3D_MT_edit_gpencil_delete,
     VIEW3D_MT_edit_gpencil_showhide,
     VIEW3D_MT_weight_gpencil,

source/blender/blenkernel/BKE_gpencil.h

@@ -329,6 +329,7 @@ struct bGPDcurve *BKE_gpencil_stroke_editcurve_new(int tot_curve_points);
  * \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.

source/blender/blenkernel/intern/gpencil.c

@@ -62,7 +62,7 @@ static CLG_LogRef LOG = {"bke.gpencil"};
 static void greasepencil_copy_data(Main *UNUSED(bmain),
                                    ID *id_dst,
                                    const ID *id_src,
-                                   const int UNUSED(flag))
+                                   const int flag)
 {
   bGPdata *gpd_dst = (bGPdata *)id_dst;
   const bGPdata *gpd_src = (const bGPdata *)id_src;
@@ -110,6 +110,13 @@ static void greasepencil_copy_data(Main *UNUSED(bmain),
 
     BLI_addtail(&gpd_dst->layers, gpl_dst);
   }
+
+  if (flag & LIB_ID_COPY_NO_PREVIEW) {
+    gpd_dst->preview = NULL;
+  }
+  else {
+    BKE_previewimg_id_copy(&gpd_dst->id, &gpd_src->id);
+  }
 }
 
 static void greasepencil_free_data(ID *id)
@@ -179,6 +186,8 @@ static void greasepencil_blend_write(BlendWriter *writer, ID *id, const void *id
         }
       }
     }
+
+    BKE_previewimg_blend_write(writer, gpd->preview);
   }
 }
 
@@ -193,6 +202,10 @@ void BKE_gpencil_blend_read_data(BlendDataReader *reader, bGPdata *gpd)
   BLO_read_data_address(reader, &gpd->adt);
   BKE_animdata_blend_read_data(reader, gpd->adt);
 
+  /* Preview. */
+  BLO_read_data_address(reader, &gpd->preview);
+  BKE_previewimg_blend_read(reader, gpd->preview);
+
   /* Ensure full objectmode for linked grease pencil. */
   if (ID_IS_LINKED(gpd)) {
     gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
@@ -495,6 +508,8 @@ void BKE_gpencil_free_data(bGPdata *gpd, bool free_all)
     /* clear cache */
     BKE_gpencil_batch_cache_free(gpd);
   }
+  /* Preview. */
+  BKE_previewimg_free(&gpd->preview);
 }
 
 void BKE_gpencil_eval_delete(bGPdata *gpd_eval)
@@ -2197,7 +2212,7 @@ int BKE_gpencil_object_material_index_get_by_name(Object *ob, const char *name)
   for (short i = 0; i < *totcol; i++) {
     read_ma = BKE_object_material_get(ob, i + 1);
     /* Material names are like "MAMaterial.001" */
-    if (STREQ(name, &read_ma->id.name[2])) {
+    if ((read_ma) && (STREQ(name, &read_ma->id.name[2]))) {
       return i;
     }
   }
@@ -3040,4 +3055,20 @@ void BKE_gpencil_update_on_write(bGPdata *gpd_orig, bGPdata *gpd_eval)
   BKE_gpencil_free_update_cache(gpd_orig);
 }
 
+/* Get min and max frame number for all layers. */
+void BKE_gpencil_frame_min_max(const bGPdata *gpd, int *r_min, int *r_max)
+{
+  *r_min = INT_MAX;
+  *r_max = INT_MIN;
+  LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
+    LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
+      if (gpf->framenum < *r_min) {
+        *r_min = gpf->framenum;
+      }
+      if (gpf->framenum > *r_max) {
+        *r_max = gpf->framenum;
+      }
+    }
+  }
+}
 /** \} */

source/blender/blenkernel/intern/icons.cc

@@ -355,6 +355,7 @@ PreviewImage **BKE_previewimg_id_get_p(const ID *id)
     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);
@@ -419,7 +420,7 @@ void BKE_previewimg_id_custom_set(ID *id, const char *filepath)
 
 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_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)

source/blender/editors/gpencil/CMakeLists.txt

@@ -28,6 +28,7 @@ set(SRC
   gpencil_add_monkey.c
   gpencil_add_stroke.c
   gpencil_armature.c
+  gpencil_asset.c
   gpencil_bake_animation.cc
   gpencil_convert.c
   gpencil_data.c

source/blender/editors/gpencil/gpencil_intern.h

@@ -667,6 +667,10 @@ void GPENCIL_OT_convert_old_files(struct wmOperatorType *ot);
 /* armatures */
 void GPENCIL_OT_generate_weights(struct wmOperatorType *ot);
 
+/* Assets. */
+void GPENCIL_OT_asset_create(struct wmOperatorType *ot);
+void GPENCIL_OT_asset_import(struct wmOperatorType *ot);
+
 /* ****************************************************** */
 /* Stroke Iteration Utilities */
 

source/blender/editors/gpencil/gpencil_ops.c

@@ -685,6 +685,10 @@ void ED_operatortypes_gpencil(void)
 
   /* armatures */
   WM_operatortype_append(GPENCIL_OT_generate_weights);
+
+  /* Assets. */
+  WM_operatortype_append(GPENCIL_OT_asset_create);
+  WM_operatortype_append(GPENCIL_OT_asset_import);
 }
 
 void ED_operatormacros_gpencil(void)

source/blender/editors/render/render_preview.cc

@@ -30,6 +30,7 @@
 #include "DNA_brush_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_collection_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_light_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
@@ -47,6 +48,7 @@
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
+#include "BKE_gpencil.h"
 #include "BKE_icons.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
@@ -365,6 +367,7 @@ static ID *duplicate_ids(ID *id, const bool allow_failure)
     case ID_MA:
     case ID_TE:
     case ID_LA:
+    case ID_GD:
     case ID_WO: {
       BLI_assert(BKE_previewimg_id_supports_jobs(id));
       ID *id_copy = BKE_id_copy_ex(nullptr,
@@ -763,6 +766,8 @@ struct ObjectPreviewData {
   /* Copy of the object to create the preview for. The copy is for thread safety (and to insert
    * it into its own main). */
   Object *object;
+  /* Datablock copy. Can be nullptr. */
+  ID *datablock;
   /* Current frame. */
   int cfra;
   int sizex;
@@ -851,7 +856,7 @@ static void object_preview_render(IconPreview *preview, IconPreviewSize *preview
   preview_data.pr_main = preview_main;
   /* Act on a copy. */
   preview_data.object = (Object *)preview->id_copy;
-  preview_data.cfra = preview->scene->r.cfra;
+  preview_data.datablock = nullptr;
   preview_data.sizex = preview_sized->sizex;
   preview_data.sizey = preview_sized->sizey;
 
@@ -1030,6 +1035,119 @@ static void action_preview_render(IconPreview *preview, IconPreviewSize *preview
 
 /** \} */
 
+/* -------------------------------------------------------------------- */
+/** \name Grease Pencil Preview
+ * \{ */
+
+static Scene *gpencil_preview_scene_create(const struct ObjectPreviewData *preview_data,
+                                           Depsgraph **r_depsgraph)
+{
+  Scene *scene = BKE_scene_add(preview_data->pr_main, "Object preview scene");
+  /* Grease pencil needs to set the scene to the current frame or the strokes
+   * will not be visible in the preview.  */
+  CFRA = preview_data->cfra;
+  ViewLayer *view_layer = (ViewLayer *)scene->view_layers.first;
+  Depsgraph *depsgraph = DEG_graph_new(
+      preview_data->pr_main, scene, view_layer, DAG_EVAL_VIEWPORT);
+
+  /* Grease pencil draw engine needs an object to draw the datablock. */
+  Object *ob_temp = BKE_object_add_for_data(preview_data->pr_main,
+                                            view_layer,
+                                            OB_GPENCIL,
+                                            "preview_object",
+                                            preview_data->datablock,
+                                            true);
+  BLI_assert(ob_temp != nullptr);
+  /* Copy the materials to get full color previews. */
+  const short *materials_len_p = BKE_id_material_len_p(preview_data->datablock);
+  if (materials_len_p && *materials_len_p > 0) {
+    BKE_object_materials_test(preview_data->pr_main, ob_temp, preview_data->datablock);
+  }
+
+  Object *camera_object = object_preview_camera_create(preview_data->pr_main, view_layer, ob_temp);
+
+  scene->camera = camera_object;
+  scene->r.xsch = preview_data->sizex;
+  scene->r.ysch = preview_data->sizey;
+  scene->r.size = 100;
+
+  Base *preview_base = BKE_view_layer_base_find(view_layer, ob_temp);
+  /* For 'view selected' below. */
+  preview_base->flag |= BASE_SELECTED;
+
+  DEG_graph_build_from_view_layer(depsgraph);
+  DEG_evaluate_on_refresh(depsgraph);
+
+  ED_view3d_camera_to_view_selected(preview_data->pr_main, depsgraph, scene, camera_object);
+
+  BKE_scene_graph_update_tagged(depsgraph, preview_data->pr_main);
+
+  *r_depsgraph = depsgraph;
+  return scene;
+}
+
+/* Render a grease pencil datablock. As the Draw Engine needs an object, the datablock is assigned
+ * to a temporary object, just for render. */
+static void gpencil_preview_render(IconPreview *preview, IconPreviewSize *preview_sized)
+{
+  Main *preview_main = BKE_main_new();
+  const float pixelsize_old = U.pixelsize;
+  char err_out[256] = "unknown";
+
+  BLI_assert(preview->id_copy && (preview->id_copy != preview->id));
+
+  /* Find the frame number to make preview visible. */
+  int f_min, f_max;
+  bGPdata *gpd = (bGPdata *)preview->id_copy;
+  BKE_gpencil_frame_min_max(gpd, &f_min, &f_max);
+  const int framenum = ((preview->scene->r.cfra < f_min) || (preview->scene->r.cfra > f_max)) ?
+                           f_min :
+                           preview->scene->r.cfra;
+
+  struct ObjectPreviewData preview_data = {};
+  preview_data.pr_main = preview_main;
+  /* Act on a copy. */
+  preview_data.object = nullptr;
+  preview_data.datablock = (ID *)preview->id_copy;
+  preview_data.cfra = framenum;
+  preview_data.sizex = preview_sized->sizex;
+  preview_data.sizey = preview_sized->sizey;
+
+  Depsgraph *depsgraph;
+  Scene *scene = gpencil_preview_scene_create(&preview_data, &depsgraph);
+
+  U.pixelsize = 2.0f;
+
+  View3DShading shading;
+  BKE_screen_view3d_shading_init(&shading);
+
+  ImBuf *ibuf = ED_view3d_draw_offscreen_imbuf_simple(
+      depsgraph,
+      DEG_get_evaluated_scene(depsgraph),
+      &shading,
+      OB_TEXTURE,
+      DEG_get_evaluated_object(depsgraph, scene->camera),
+      preview_sized->sizex,
+      preview_sized->sizey,
+      IB_rect,
+      V3D_OFSDRAW_OVERRIDE_SCENE_SETTINGS,
+      R_ALPHAPREMUL,
+      nullptr,
+      nullptr,
+      err_out);
+
+  U.pixelsize = pixelsize_old;
+
+  if (ibuf) {
+    icon_copy_rect(ibuf, preview_sized->sizex, preview_sized->sizey, preview_sized->rect);
+    IMB_freeImBuf(ibuf);
+  }
+
+  DEG_graph_free(depsgraph);
+  BKE_main_free(preview_main);
+}
+/** \} */
+
 /* -------------------------------------------------------------------- */
 /** \name New Shader Preview System
  * \{ */
@@ -1634,6 +1752,9 @@ static void icon_preview_startjob_all_sizes(void *customdata,
         case ID_AC:
           action_preview_render(ip, cur_size);
           continue;
+        case ID_GD:
+          gpencil_preview_render(ip, cur_size);
+          continue;
         default:
           /* Fall through to the same code as the `ip->id == nullptr` case. */
           break;

source/blender/editors/space_view3d/space_view3d.c

@@ -609,12 +609,17 @@ static bool view3d_world_drop_poll(bContext *C, wmDrag *drag, const wmEvent *eve
 static bool view3d_object_data_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 {
   ID_Type id_type = view3d_drop_id_in_main_region_poll_get_id_type(C, drag, event);
-  if (id_type && OB_DATA_SUPPORT_ID(id_type)) {
+  if (id_type && OB_DATA_SUPPORT_ID(id_type) && (id_type != ID_GD)) {
     return true;
   }
   return false;
 }
 
+static bool view3d_gpencil_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
+{
+  return view3d_drop_id_in_main_region_poll(C, drag, event, ID_GD);
+}
+
 static char *view3d_object_data_drop_tooltip(bContext *UNUSED(C),
                                              wmDrag *UNUSED(drag),
                                              const int UNUSED(xy[2]),
@@ -623,6 +628,14 @@ static char *view3d_object_data_drop_tooltip(bContext *UNUSED(C),
   return BLI_strdup(TIP_("Create object instance from object-data"));
 }
 
+static char *view3d_gpencil_data_drop_tooltip(bContext *UNUSED(C),
+                                              wmDrag *UNUSED(drag),
+                                              const int UNUSED(xy[2]),
+                                              wmDropBox *UNUSED(drop))
+{
+  return BLI_strdup(TIP_("Add strokes to active object"));
+}
+
 static bool view3d_ima_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 {
   if (ED_region_overlap_isect_any_xy(CTX_wm_area(C), event->xy)) {
@@ -945,6 +958,14 @@ static void view3d_dropboxes(void)
                  view3d_id_drop_copy,
                  WM_drag_free_imported_drag_ID,
                  NULL);
+
+  /* TODO(@antoniov): Change to use a temp copy using BLO_library_temp_load_id (). */
+  WM_dropbox_add(lb,
+                 "GPENCIL_OT_asset_import",
+                 view3d_gpencil_drop_poll,
+                 view3d_id_drop_copy_with_type,
+                 WM_drag_free_imported_drag_ID,
+                 view3d_gpencil_data_drop_tooltip);
 }
 
 static void view3d_widgets(void)

source/blender/makesdna/DNA_gpencil_types.h

@@ -751,6 +751,9 @@ typedef struct bGPdata {
   /* NOTE: When adding new members, make sure to add them to BKE_gpencil_data_copy_settings as
    * well! */
 
+  /** Preview image for assets. */
+  struct PreviewImage *preview;
+
   bGPdata_Runtime runtime;
 } bGPdata;