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

[Julian Eisel]

Commit: b2126c6a78412079f875698d647626b92a363a56
Author: Julian Eisel
Date:   Sun Jul 5 01:02:05 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rBb2126c6a78412079f875698d647626b92a363a56

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/editors/space_outliner/outliner_tools.c
index 58f1b88c0ef,a77b5424eb6..4159b16e680
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@@ -1543,10 -1521,9 +1543,10 @@@ typedef enum eOutlinerIdOpTypes 
    OUTLINER_IDOP_SELECT_LINKED,
  } eOutlinerIdOpTypes;
  
- // TODO: implement support for changing the ID-block used
+ /* TODO: implement support for changing the ID-block used. */
  static const EnumPropertyItem prop_id_op_types[] = {
      {OUTLINER_IDOP_UNLINK, "UNLINK", 0, "Unlink", ""},
 +    {OUTLINER_IDOP_CREATE_ASSET, "CREATE_ASSET", 0, "Create Asset", ""},
      {OUTLINER_IDOP_LOCAL, "LOCAL", 0, "Make Local", ""},
      {OUTLINER_IDOP_OVERRIDE_LIBRARY,
       "OVERRIDE_LIBRARY",