[Bf-blender-cvs] [4137cc7] asset-engine: Cleanup: rename BKE_asset to BKE_asset_engine.
Bastien Montagne
noreply at git.blender.org
Thu Jun 30 14:34:52 CEST 2016
Commit: 4137cc79f25333534faa08a34ec3bc2a0ee4dc61
Author: Bastien Montagne
Date: Wed Jun 29 22:09:37 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB4137cc79f25333534faa08a34ec3bc2a0ee4dc61
Cleanup: rename BKE_asset to BKE_asset_engine.
Since this file mostly defines/handles interactions with asset engines...
Asset handling itself is more done in library area (will split it too in next commit).
===================================================================
D source/blender/blenkernel/BKE_asset.h
A source/blender/blenkernel/BKE_asset_engine.h
M source/blender/blenkernel/CMakeLists.txt
D source/blender/blenkernel/intern/asset.c
A source/blender/blenkernel/intern/asset_engine.c
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/filelist.h
M source/blender/editors/space_file/space_file.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_asset.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_asset.h b/source/blender/blenkernel/BKE_asset_engine.h
similarity index 98%
rename from source/blender/blenkernel/BKE_asset.h
rename to source/blender/blenkernel/BKE_asset_engine.h
index 4a5ed58..60daec4 100644
--- a/source/blender/blenkernel/BKE_asset.h
+++ b/source/blender/blenkernel/BKE_asset_engine.h
@@ -25,12 +25,12 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file BKE_asset.h
+/** \file BKE_asset_engine.h
* \ingroup bke
*/
-#ifndef __BKE_ASSET_H__
-#define __BKE_ASSET_H__
+#ifndef __BKE_ASSET_ENGINE_H__
+#define __BKE_ASSET_ENGINE_H__
#ifdef __cplusplus
extern "C" {
@@ -242,4 +242,4 @@ bool BKE_asset_uuid_cmp(const void *a, const void *b);
}
#endif
-#endif /* __BKE_ASSET_H__ */
+#endif /* __BKE_ASSET_ENGINE_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 9007a67..936fd33 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -70,7 +70,7 @@ set(SRC
intern/appdir.c
intern/armature.c
intern/armature_update.c
- intern/asset.c
+ intern/asset_engine.c
intern/autoexec.c
intern/blender.c
intern/blender_copybuffer.c
@@ -195,7 +195,7 @@ set(SRC
BKE_animsys.h
BKE_appdir.h
BKE_armature.h
- BKE_asset.h
+ BKE_asset_engine.h
BKE_autoexec.h
BKE_blender.h
BKE_blender_copybuffer.h
diff --git a/source/blender/blenkernel/intern/asset.c b/source/blender/blenkernel/intern/asset_engine.c
similarity index 99%
rename from source/blender/blenkernel/intern/asset.c
rename to source/blender/blenkernel/intern/asset_engine.c
index 3f4894d..e6b3cd0 100644
--- a/source/blender/blenkernel/intern/asset.c
+++ b/source/blender/blenkernel/intern/asset_engine.c
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenkernel/intern/asset.c
+/** \file blender/blenkernel/intern/asset_engine.c
* \ingroup bke
*/
@@ -48,7 +48,7 @@
#include "PIL_time.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_global.h"
#include "BKE_idprop.h"
#include "BKE_library.h"
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 25491bc..3740fdc 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -47,7 +47,7 @@
#include "IMB_imbuf.h"
#include "IMB_moviecache.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_blender.h" /* own include */
#include "BKE_blender_version.h" /* own include */
#include "BKE_blendfile.h"
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index fc704bf..7676ed1 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -81,7 +81,7 @@
#include "BKE_action.h"
#include "BKE_animsys.h"
#include "BKE_armature.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_bpath.h"
#include "BKE_brush.h"
#include "BKE_camera.h"
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 23240d7..10c82b3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -115,7 +115,7 @@
#include "BKE_action.h"
#include "BKE_armature.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_blender_version.h"
#include "BKE_brush.h"
#include "BKE_cloth.h"
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 6d1916c..6fb5572 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -40,7 +40,7 @@
#include "BLO_readfile.h"
#include "BKE_appdir.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_context.h"
#include "BKE_screen.h"
#include "BKE_global.h"
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 8e2eed8..814eb846 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -65,7 +65,7 @@
#include "RNA_types.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_library.h"
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index cd008d4..ee768ba 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -37,7 +37,7 @@
extern "C" {
#endif
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
struct AssetEngineType;
struct AssetEngine;
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 9f5fffc..7e230b5 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -43,7 +43,7 @@
#include "RNA_types.h"
#include "BKE_appdir.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_context.h"
#include "BKE_screen.h"
#include "BKE_global.h"
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 813c106..8af9fa8 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3299,7 +3299,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
{"rna_animviz.c", NULL, RNA_def_animviz},
{"rna_actuator.c", "rna_actuator_api.c", RNA_def_actuator},
{"rna_armature.c", "rna_armature_api.c", RNA_def_armature},
- {"rna_asset.c", NULL, RNA_def_asset},
+ {"rna_asset.c", NULL, RNA_def_asset},
{"rna_boid.c", NULL, RNA_def_boid},
{"rna_brush.c", NULL, RNA_def_brush},
{"rna_camera.c", "rna_camera_api.c", RNA_def_camera},
diff --git a/source/blender/makesrna/intern/rna_asset.c b/source/blender/makesrna/intern/rna_asset.c
index 0d1279e..afd23e9 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -35,7 +35,7 @@
#include "rna_internal.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_idprop.h"
#include "WM_types.h"
@@ -46,7 +46,6 @@
#include "RNA_access.h"
-#include "BKE_asset.h"
#include "BKE_context.h"
#include "BKE_report.h"
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 98c61b0..d9cea11 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -35,7 +35,7 @@
#include "RNA_define.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_image.h"
#include "BKE_key.h"
#include "BKE_movieclip.h"
@@ -253,7 +253,7 @@ EnumPropertyItem rna_enum_file_sort_items[] = {
#include "BLI_math.h"
#include "BKE_animsys.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_brush.h"
#include "BKE_colortools.h"
#include "BKE_context.h"
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 4a48143..51fbaba 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -52,7 +52,7 @@
#include "RNA_access.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_context.h"
#include "BKE_idprop.h"
#include "BKE_global.h"
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index f3792e0..b06fc69 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -62,7 +62,7 @@
#include "BLO_readfile.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_library.h"
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 4d5156f..91322c8 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -56,7 +56,7 @@
#include "BLO_writefile.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_blender.h"
#include "BKE_blender_undo.h"
#include "BKE_context.h"
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 2917c5f..f1434e9 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -52,7 +52,7 @@
/* mostly init functions */
#include "BKE_appdir.h"
-#include "BKE_asset.h"
+#include "BKE_asset_engine.h"
#include "BKE_blender.h"
#include "BKE_brush.h"
#include "BKE_context.h"
More information about the Bf-blender-cvs
mailing list