[Bf-blender-cvs] [e73647ab2c3] asset-browser: Merge branch 'asset-metadata' into asset-browser

[Julian Eisel]

Commit: e73647ab2c3b677589163f873b000d910aee59a2
Author: Julian Eisel
Date:   Thu Oct 22 13:18:03 2020 +0200
Branches: asset-browser
https://developer.blender.org/rBe73647ab2c3b677589163f873b000d910aee59a2

Merge branch 'asset-metadata' into asset-browser

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



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

diff --cc source/blender/windowmanager/WM_types.h
index 6c8b390bd54,a8d24205268..9f4ad9f3c29
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -817,12 -830,12 +830,13 @@@ typedef void (*wmPaintCursorDraw)(struc
  /* *************** Drag and drop *************** */
  
  #define WM_DRAG_ID 0
 -#define WM_DRAG_RNA 1
 -#define WM_DRAG_PATH 2
 -#define WM_DRAG_NAME 3
 -#define WM_DRAG_VALUE 4
 -#define WM_DRAG_COLOR 5
 -#define WM_DRAG_DATASTACK 6
 +#define WM_DRAG_ASSET 1
 +#define WM_DRAG_RNA 2
 +#define WM_DRAG_PATH 3
 +#define WM_DRAG_NAME 4
 +#define WM_DRAG_VALUE 5
 +#define WM_DRAG_COLOR 6
++#define WM_DRAG_DATASTACK 7
  
  typedef enum wmDragFlags {
    WM_DRAG_NOP = 0,