[Bf-blender-cvs] [e31f282917e] master: Cleanup: Minor cleanups in asset system headers

Julian Eisel noreply at git.blender.org
Fri Nov 18 12:46:02 CET 2022


Commit: e31f282917ed239abb56c1c3077c864139ada0de
Author: Julian Eisel
Date:   Fri Nov 18 12:07:00 2022 +0100
Branches: master
https://developer.blender.org/rBe31f282917ed239abb56c1c3077c864139ada0de

Cleanup: Minor cleanups in asset system headers

- Move main comment on class to header comment where it's more visible.
- Improve comment.
- Move stdlib includes first, like we do it usually
- Separate includes my code module
- Remove unnecessary forward declarations

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

M	source/blender/asset_system/AS_asset_catalog.hh
M	source/blender/asset_system/AS_asset_library.hh
M	source/blender/asset_system/AS_asset_representation.hh

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

diff --git a/source/blender/asset_system/AS_asset_catalog.hh b/source/blender/asset_system/AS_asset_catalog.hh
index 71d53f25261..5cf7c0e3188 100644
--- a/source/blender/asset_system/AS_asset_catalog.hh
+++ b/source/blender/asset_system/AS_asset_catalog.hh
@@ -6,6 +6,11 @@
 
 #pragma once
 
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+
 #include "BLI_function_ref.hh"
 #include "BLI_map.hh"
 #include "BLI_set.hh"
@@ -15,11 +20,6 @@
 
 #include "AS_asset_catalog_path.hh"
 
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-
 namespace blender::asset_system {
 
 class AssetCatalog;
diff --git a/source/blender/asset_system/AS_asset_library.hh b/source/blender/asset_system/AS_asset_library.hh
index 4bd5ee3446d..97db15dd640 100644
--- a/source/blender/asset_system/AS_asset_library.hh
+++ b/source/blender/asset_system/AS_asset_library.hh
@@ -6,20 +6,19 @@
 
 #pragma once
 
+#include <memory>
+
+#include "AS_asset_catalog.hh"
+
 #include "DNA_asset_types.h"
 
 #include "BLI_set.hh"
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
 
-#include "AS_asset_catalog.hh"
 #include "BKE_callbacks.h"
 
-#include <memory>
-
 struct AssetLibrary;
-struct AssetLibraryReference;
-struct AssetMetaData;
 struct IDRemapper;
 struct Main;
 
diff --git a/source/blender/asset_system/AS_asset_representation.hh b/source/blender/asset_system/AS_asset_representation.hh
index 15e10d6c98f..6a4a41f08f3 100644
--- a/source/blender/asset_system/AS_asset_representation.hh
+++ b/source/blender/asset_system/AS_asset_representation.hh
@@ -2,6 +2,11 @@
 
 /** \file
  * \ingroup asset_system
+ *
+ * \brief Main runtime representation of an asset.
+ *
+ * Abstraction to reference an asset, with necessary data for display & interaction.
+ * https://wiki.blender.org/wiki/Source/Architecture/Asset_System/Back_End#Asset_Representation
  */
 
 #pragma once
@@ -16,11 +21,6 @@ struct ID;
 
 namespace blender::asset_system {
 
-/**
- * \brief Abstraction to reference an asset, with necessary data for display & interaction.
- *
- * https://wiki.blender.org/wiki/Source/Architecture/Asset_System/Back_End#Asset_Representation
- */
 class AssetRepresentation {
   friend struct AssetLibrary;
   friend class AssetStorage;



More information about the Bf-blender-cvs mailing list