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

[Julian Eisel]

Commit: bb51bc2a6d0920aec9b199a5484f6f6c37ca3bfc
Author: Julian Eisel
Date:   Thu Sep 10 18:49:12 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rBbb51bc2a6d0920aec9b199a5484f6f6c37ca3bfc

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 215fc9c4dba,cf43d0fe845..a1d174090a9
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -77,7 -77,7 +77,8 @@@ set(SR
    intern/armature.c
    intern/armature_deform.c
    intern/armature_update.c
 +  intern/asset.c
+   intern/attribute.c
    intern/autoexec.c
    intern/blender.c
    intern/blender_copybuffer.c
@@@ -268,8 -268,8 +269,9 @@@
    BKE_animsys.h
    BKE_appdir.h
    BKE_armature.h
+   BKE_attribute.h
    BKE_autoexec.h
 +  BKE_asset.h
    BKE_blender.h
    BKE_blender_copybuffer.h
    BKE_blender_undo.h
diff --cc source/blender/blenkernel/intern/lib_id_delete.c
index a5b9c7d6bcf,22ea5f2c854..18339a0d26b
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@@ -61,12 -61,9 +62,13 @@@ void BKE_libblock_free_data(ID *id, con
  
    if (id->override_library) {
      BKE_lib_override_library_free(&id->override_library, do_id_user);
+     id->override_library = NULL;
    }
  
 +  if (id->asset_data) {
 +    BKE_asset_data_free(id->asset_data);
 +  }
 +
    BKE_animdata_free(id, do_id_user);
  }
  
diff --cc source/blender/blenloader/intern/readfile.c
index 2f9bd424303,3d42330dd4f..c53956ffb4f
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -114,8 -113,8 +114,9 @@@
  
  #include "BKE_action.h"
  #include "BKE_anim_data.h"
+ #include "BKE_animsys.h"
  #include "BKE_armature.h"
 +#include "BKE_asset.h"
  #include "BKE_brush.h"
  #include "BKE_collection.h"
  #include "BKE_colortools.h"
diff --cc source/blender/editors/CMakeLists.txt
index fd3b887716d,1f5dc73f732..a2ae350ce4b
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@@ -22,8 -22,9 +22,10 @@@ if(WITH_BLENDER
  
    add_subdirectory(animation)
    add_subdirectory(armature)
 +  add_subdirectory(asset)
    add_subdirectory(curve)
+   add_subdirectory(geometry)
+   add_subdirectory(gizmo_library)
    add_subdirectory(gpencil)
    add_subdirectory(interface)
    add_subdirectory(io)
diff --cc source/blender/makesrna/RNA_access.h
index e49f583eeef,8ee10047750..59b93dce880
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -67,7 -67,8 +67,9 @@@ extern StructRNA RNA_ArmatureGpencilMod
  extern StructRNA RNA_ArmatureModifier;
  extern StructRNA RNA_ArrayGpencilModifier;
  extern StructRNA RNA_ArrayModifier;
+ extern StructRNA RNA_Attribute;
+ extern StructRNA RNA_AttributeGroup;
 +extern StructRNA RNA_AssetData;
  extern StructRNA RNA_BackgroundImage;
  extern StructRNA RNA_BevelModifier;
  extern StructRNA RNA_BezierSplinePoint;
diff --cc source/blender/makesrna/intern/CMakeLists.txt
index 78f9447e6d6,0387f83d695..095a29d3256
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@@ -30,7 -30,7 +30,8 @@@ set(DEFSR
    rna_animation.c
    rna_animviz.c
    rna_armature.c
+   rna_attribute.c
 +  rna_asset.c
    rna_boid.c
    rna_brush.c
    rna_cachefile.c
diff --cc source/blender/makesrna/intern/makesrna.c
index 529aea0a2a2,f1086ab69bc..292d7df95d5
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@@ -4272,7 -4276,7 +4276,8 @@@ static RNAProcessItem PROCESS_ITEMS[] 
      {"rna_animation.c", "rna_animation_api.c", RNA_def_animation},
      {"rna_animviz.c", NULL, RNA_def_animviz},
      {"rna_armature.c", "rna_armature_api.c", RNA_def_armature},
+     {"rna_attribute.c", NULL, RNA_def_attribute},
 +    {"rna_asset.c", NULL, RNA_def_asset},
      {"rna_boid.c", NULL, RNA_def_boid},
      {"rna_brush.c", NULL, RNA_def_brush},
      {"rna_cachefile.c", NULL, RNA_def_cachefile},
diff --cc source/blender/makesrna/intern/rna_internal.h
index 2c35540627c,eaf4e8866f9..0098f0e5308
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@@ -151,7 -151,7 +151,8 @@@ void RNA_def_action(struct BlenderRNA *
  void RNA_def_animation(struct BlenderRNA *brna);
  void RNA_def_animviz(struct BlenderRNA *brna);
  void RNA_def_armature(struct BlenderRNA *brna);
+ void RNA_def_attribute(struct BlenderRNA *brna);
 +void RNA_def_asset(struct BlenderRNA *brna);
  void RNA_def_boid(struct BlenderRNA *brna);
  void RNA_def_brush(struct BlenderRNA *brna);
  void RNA_def_cachefile(struct BlenderRNA *brna);