[Bf-blender-cvs] [8fc9c6e9f25] asset-metadata: Merge branch 'master' into asset-metadata

[Julian Eisel]

Commit: 8fc9c6e9f25c059697198574aecce90cfe7e8f1c
Author: Julian Eisel
Date:   Fri Jul 17 00:50:57 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rB8fc9c6e9f25c059697198574aecce90cfe7e8f1c

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/editors/space_outliner/outliner_tools.c
index 44d96fd2dd5,b59cd5bc128..c9a5fd603fd
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@@ -1527,9 -1545,9 +1566,10 @@@ typedef enum eOutlinerIdOpTypes 
    OUTLINER_IDOP_INVALID = 0,
  
    OUTLINER_IDOP_UNLINK,
 +  OUTLINER_IDOP_CREATE_ASSET,
    OUTLINER_IDOP_LOCAL,
    OUTLINER_IDOP_OVERRIDE_LIBRARY,
+   OUTLINER_IDOP_OVERRIDE_LIBRARY_HIERARCHY,
    OUTLINER_IDOP_SINGLE,
    OUTLINER_IDOP_DELETE,
    OUTLINER_IDOP_REMAP,