diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/tests/blendfile_loading_base_test.cc | 2 | ||||
-rw-r--r-- | source/creator/creator.c | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 128d7f86f21..e3591b8fcd1 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1336,8 +1336,8 @@ int ntreeTexExecTree(struct bNodeTree *ntree, /** \} */ -void init_nodesystem(void); -void free_nodesystem(void); +void BKE_node_system_init(void); +void BKE_node_system_exit(void); /* -------------------------------------------------------------------- */ /* evaluation support, */ diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 4e8a32a6e00..5df42e4ccd6 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -263,7 +263,7 @@ extern unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT]; extern unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT]; extern float PSYS_FRAND_BASE[PSYS_FRAND_COUNT]; -void psys_init_rng(void); +void BKE_particle_init_rng(void); BLI_INLINE float psys_frand(ParticleSystem *psys, unsigned int seed) { diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 897552723ee..71c859e1514 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -100,7 +100,7 @@ void BKE_blender_free(void) IMB_moviecache_destruct(); - free_nodesystem(); + BKE_node_system_exit(); } /** \} */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index c0d50189938..e2e61284d2e 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -4663,7 +4663,7 @@ static void registerFunctionNodes(void) register_node_type_fn_random_float(); } -void init_nodesystem(void) +void BKE_node_system_init(void) { nodetreetypes_hash = BLI_ghash_str_new("nodetreetypes_hash gh"); nodetypes_hash = BLI_ghash_str_new("nodetypes_hash gh"); @@ -4690,7 +4690,7 @@ void init_nodesystem(void) registerFunctionNodes(); } -void free_nodesystem(void) +void BKE_node_system_exit(void) { if (nodetypes_hash) { NODE_TYPES_BEGIN (nt) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index abcd0b0e0e4..d323849d72d 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -514,7 +514,7 @@ unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT]; unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT]; float PSYS_FRAND_BASE[PSYS_FRAND_COUNT]; -void psys_init_rng(void) +void BKE_particle_init_rng(void) { RNG *rng = BLI_rng_new_srandom(5831); /* arbitrary */ for (int i = 0; i < PSYS_FRAND_COUNT; i++) { diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index e34be68abbf..cb5fcdbe3c6 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -73,7 +73,7 @@ void BlendfileLoadingBaseTest::SetUpTestCase() BKE_modifier_init(); DEG_register_node_types(); RNA_init(); - init_nodesystem(); + BKE_node_system_init(); G.background = true; G.factory_startup = true; diff --git a/source/creator/creator.c b/source/creator/creator.c index 03608b59117..3365dad75d1 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -437,8 +437,8 @@ int main(int argc, RNA_init(); RE_engines_init(); - init_nodesystem(); - psys_init_rng(); + BKE_node_system_init(); + BKE_particle_init_rng(); /* End second initialization. */ #if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS) |