[Bf-blender-cvs] [8311bfe45cd] temp-asset-module: Minor cleanups

Julian Eisel noreply at git.blender.org
Thu Nov 10 12:18:51 CET 2022


Commit: 8311bfe45cd268e81901073be6aa2cf9e89647fd
Author: Julian Eisel
Date:   Thu Nov 10 12:17:51 2022 +0100
Branches: temp-asset-module
https://developer.blender.org/rB8311bfe45cd268e81901073be6aa2cf9e89647fd

Minor cleanups

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

M	source/blender/asset_system/AS_asset_library.hh
M	source/blender/asset_system/intern/asset_library.cc
M	source/blender/editors/space_node/add_menu_assets.cc
M	source/blender/editors/space_node/add_node_search.cc

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

diff --git a/source/blender/asset_system/AS_asset_library.hh b/source/blender/asset_system/AS_asset_library.hh
index 9b3b7d5e59a..a0f1214ad39 100644
--- a/source/blender/asset_system/AS_asset_library.hh
+++ b/source/blender/asset_system/AS_asset_library.hh
@@ -18,6 +18,7 @@
 
 struct AssetLibrary;
 struct AssetLibraryReference;
+struct AssetMetaData;
 struct Main;
 
 namespace blender::asset_system {
diff --git a/source/blender/asset_system/intern/asset_library.cc b/source/blender/asset_system/intern/asset_library.cc
index ad16f9f1c42..b52594fa20c 100644
--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@@ -9,7 +9,6 @@
 #include "AS_asset_library.h"
 #include "AS_asset_library.hh"
 #include "AS_asset_representation.hh"
-#include "asset_library_service.hh"
 
 #include "BKE_lib_remap.h"
 #include "BKE_main.h"
@@ -22,6 +21,8 @@
 #include "DNA_asset_types.h"
 #include "DNA_userdef_types.h"
 
+#include "asset_library_service.hh"
+
 using namespace blender;
 using namespace blender::asset_system;
 
diff --git a/source/blender/editors/space_node/add_menu_assets.cc b/source/blender/editors/space_node/add_menu_assets.cc
index 19a59f64466..c4cd5819d60 100644
--- a/source/blender/editors/space_node/add_menu_assets.cc
+++ b/source/blender/editors/space_node/add_menu_assets.cc
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "AS_asset_catalog.hh"
 #include "AS_asset_library.hh"
 
 #include "BLI_multi_value_map.hh"
@@ -7,7 +8,6 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
-#include "AS_asset_catalog.hh"
 #include "BKE_asset.h"
 #include "BKE_idprop.h"
 #include "BKE_screen.h"
diff --git a/source/blender/editors/space_node/add_node_search.cc b/source/blender/editors/space_node/add_node_search.cc
index a7463be0af0..adeddfd115d 100644
--- a/source/blender/editors/space_node/add_node_search.cc
+++ b/source/blender/editors/space_node/add_node_search.cc
@@ -2,6 +2,7 @@
 
 #include <optional>
 
+#include "AS_asset_catalog.hh"
 #include "AS_asset_library.hh"
 
 #include "BLI_listbase.h"
@@ -10,7 +11,6 @@
 #include "DNA_space_types.h"
 
 #include "BKE_asset.h"
-#include "AS_asset_catalog.hh"
 #include "BKE_context.h"
 #include "BKE_idprop.h"
 #include "BKE_lib_id.h"



More information about the Bf-blender-cvs mailing list