diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-04-07 04:01:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-07 04:01:47 +0300 |
commit | e2eeb46a1bda8cf49a70e78a45d12fede27a1af9 (patch) | |
tree | a8709054ac347400dc4b896f450343bb033217e5 /source/blender/blenkernel | |
parent | 5217d2bc0e29695bea74950ff05a9215a85ff703 (diff) |
Cleanup: rename treehash -> outliner_treehash
This is an API specifically for the outliner,
not some generic hierarchical hash structure.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_outliner_treehash.h (renamed from source/blender/blenkernel/BKE_treehash.h) | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/outliner_treehash.c (renamed from source/blender/blenkernel/intern/treehash.c) | 24 |
3 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/blenkernel/BKE_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.h index 16ab02c0965..454edb40c4e 100644 --- a/source/blender/blenkernel/BKE_treehash.h +++ b/source/blender/blenkernel/BKE_outliner_treehash.h @@ -19,10 +19,10 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BKE_TREEHASH_H__ -#define __BKE_TREEHASH_H__ +#ifndef __BKE_OUTLINER_TREEHASH_H__ +#define __BKE_OUTLINER_TREEHASH_H__ -/** \file BKE_treehash.h +/** \file BKE_outliner_treehash.h * \ingroup bke */ @@ -31,21 +31,21 @@ struct BLI_mempool; struct TreeStoreElem; /* create and fill hashtable with treestore elements */ -void *BKE_treehash_create_from_treestore(struct BLI_mempool *treestore); +void *BKE_outliner_treehash_create_from_treestore(struct BLI_mempool *treestore); /* full rebuild for already allocated hashtable */ -void *BKE_treehash_rebuild_from_treestore(void *treehash, struct BLI_mempool *treestore); +void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, struct BLI_mempool *treestore); /* full rebuild for already allocated hashtable */ -void BKE_treehash_add_element(void *treehash, struct TreeStoreElem *elem); +void BKE_outliner_treehash_add_element(void *treehash, struct TreeStoreElem *elem); /* find first unused element with specific type, nr and id */ -struct TreeStoreElem *BKE_treehash_lookup_unused(void *treehash, short type, short nr, struct ID *id); +struct TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash, short type, short nr, struct ID *id); /* find user or unused element with specific type, nr and id */ -struct TreeStoreElem *BKE_treehash_lookup_any(void *treehash, short type, short nr, struct ID *id); +struct TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash, short type, short nr, struct ID *id); /* free treehash structure */ -void BKE_treehash_free(void *treehash); +void BKE_outliner_treehash_free(void *treehash); #endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index f19c1066766..67c8f0fc558 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -135,6 +135,7 @@ set(SRC intern/object_deform.c intern/object_dupli.c intern/ocean.c + intern/outliner_treehash.c intern/packedFile.c intern/paint.c intern/particle.c @@ -172,7 +173,6 @@ set(SRC intern/tracking_solver.c intern/tracking_stabilize.c intern/tracking_util.c - intern/treehash.c intern/unit.c intern/world.c intern/writeavi.c @@ -211,6 +211,8 @@ set(SRC BKE_depsgraph.h BKE_displist.h BKE_dynamicpaint.h + BKE_editmesh.h + BKE_editmesh_bvh.h BKE_effect.h BKE_fcurve.h BKE_fluidsim.h @@ -246,6 +248,7 @@ set(SRC BKE_object.h BKE_object_deform.h BKE_ocean.h + BKE_outliner_treehash.h BKE_packedFile.h BKE_paint.h BKE_particle.h @@ -266,12 +269,9 @@ set(SRC BKE_speaker.h BKE_subsurf.h BKE_suggestions.h - BKE_editmesh.h - BKE_editmesh_bvh.h BKE_text.h BKE_texture.h BKE_tracking.h - BKE_treehash.h BKE_unit.h BKE_utildefines.h BKE_world.h diff --git a/source/blender/blenkernel/intern/treehash.c b/source/blender/blenkernel/intern/outliner_treehash.c index 43eeae7329e..1cce61561e0 100644 --- a/source/blender/blenkernel/intern/treehash.c +++ b/source/blender/blenkernel/intern/outliner_treehash.c @@ -20,7 +20,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file treehash.c +/** \file outliner_treehash.c * \ingroup bke * * Tree hash for the outliner space. @@ -28,7 +28,7 @@ #include <stdlib.h> -#include "BKE_treehash.h" +#include "BKE_outliner_treehash.h" #include "BLI_utildefines.h" #include "BLI_ghash.h" @@ -104,11 +104,11 @@ static void fill_treehash(void *treehash, BLI_mempool *treestore) BLI_mempool_iter iter; BLI_mempool_iternew(treestore, &iter); while ((tselem = BLI_mempool_iterstep(&iter))) { - BKE_treehash_add_element(treehash, tselem); + BKE_outliner_treehash_add_element(treehash, tselem); } } -void *BKE_treehash_create_from_treestore(BLI_mempool *treestore) +void *BKE_outliner_treehash_create_from_treestore(BLI_mempool *treestore) { GHash *treehash = BLI_ghash_new_ex(tse_hash, tse_cmp, "treehash", BLI_mempool_count(treestore)); fill_treehash(treehash, treestore); @@ -120,14 +120,14 @@ static void free_treehash_group(void *key) tse_group_free(key); } -void *BKE_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *treestore) +void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *treestore) { BLI_ghash_clear_ex(treehash, NULL, free_treehash_group, BLI_mempool_count(treestore)); fill_treehash(treehash, treestore); return treehash; } -void BKE_treehash_add_element(void *treehash, TreeStoreElem *elem) +void BKE_outliner_treehash_add_element(void *treehash, TreeStoreElem *elem) { TseGroup *group; void **val_p; @@ -139,7 +139,7 @@ void BKE_treehash_add_element(void *treehash, TreeStoreElem *elem) tse_group_add(group, elem); } -static TseGroup *BKE_treehash_lookup_group(GHash *th, short type, short nr, struct ID *id) +static TseGroup *BKE_outliner_treehash_lookup_group(GHash *th, short type, short nr, struct ID *id) { TreeStoreElem tse_template; tse_template.type = type; @@ -148,9 +148,9 @@ static TseGroup *BKE_treehash_lookup_group(GHash *th, short type, short nr, stru return BLI_ghash_lookup(th, &tse_template); } -TreeStoreElem *BKE_treehash_lookup_unused(void *treehash, short type, short nr, struct ID *id) +TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash, short type, short nr, struct ID *id) { - TseGroup *group = BKE_treehash_lookup_group(treehash, type, nr, id); + TseGroup *group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id); if (group) { int i; for (i = 0; i < group->size; i++) { @@ -162,13 +162,13 @@ TreeStoreElem *BKE_treehash_lookup_unused(void *treehash, short type, short nr, return NULL; } -TreeStoreElem *BKE_treehash_lookup_any(void *treehash, short type, short nr, struct ID *id) +TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash, short type, short nr, struct ID *id) { - TseGroup *group = BKE_treehash_lookup_group(treehash, type, nr, id); + TseGroup *group = BKE_outliner_treehash_lookup_group(treehash, type, nr, id); return group ? group->elems[0] : NULL; } -void BKE_treehash_free(void *treehash) +void BKE_outliner_treehash_free(void *treehash) { BLI_ghash_free(treehash, NULL, free_treehash_group); } |