[Bf-blender-cvs] [c67a650718a] asset-browser-grid-view: Merge branch 'master' into asset-browser-grid-view

[Julian Eisel]

Commit: c67a650718a692b7400bd78fddf83e4dba054331
Author: Julian Eisel
Date:   Tue May 10 17:09:13 2022 +0200
Branches: asset-browser-grid-view
https://developer.blender.org/rBc67a650718a692b7400bd78fddf83e4dba054331

Merge branch 'master' into asset-browser-grid-view

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



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

diff --cc source/blender/makesdna/DNA_space_types.h
index dcb4c35099b,8e29d88a583..3317a3860e9
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -2084,10 -2064,9 +2094,10 @@@ typedef enum eSpace_Type 
    SPACE_CLIP = 20,
    SPACE_TOPBAR = 21,
    SPACE_STATUSBAR = 22,
 -  SPACE_SPREADSHEET = 23
 +  SPACE_SPREADSHEET = 23,
 +  SPACE_ASSETS = 24
  
- #define SPACE_TYPE_LAST SPACE_ASSETS
 -#define SPACE_TYPE_NUM (SPACE_SPREADSHEET + 1)
++#define SPACE_TYPE_NUM (SPACE_ASSETS + 1)
  } eSpace_Type;
  
  /* use for function args */