forked from bartvdbraak/blender
Cleanup: use 'BKE_' prefix for initialization functions
This commit is contained in:
parent
3c097af51f
commit
d9e7a42640
@ -1336,8 +1336,8 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
|
|||||||
|
|
||||||
/** \} */
|
/** \} */
|
||||||
|
|
||||||
void init_nodesystem(void);
|
void BKE_node_system_init(void);
|
||||||
void free_nodesystem(void);
|
void BKE_node_system_exit(void);
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/* evaluation support, */
|
/* evaluation support, */
|
||||||
|
@ -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 unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT];
|
||||||
extern float PSYS_FRAND_BASE[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)
|
BLI_INLINE float psys_frand(ParticleSystem *psys, unsigned int seed)
|
||||||
{
|
{
|
||||||
|
@ -100,7 +100,7 @@ void BKE_blender_free(void)
|
|||||||
|
|
||||||
IMB_moviecache_destruct();
|
IMB_moviecache_destruct();
|
||||||
|
|
||||||
free_nodesystem();
|
BKE_node_system_exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \} */
|
/** \} */
|
||||||
|
@ -4663,7 +4663,7 @@ static void registerFunctionNodes(void)
|
|||||||
register_node_type_fn_random_float();
|
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");
|
nodetreetypes_hash = BLI_ghash_str_new("nodetreetypes_hash gh");
|
||||||
nodetypes_hash = BLI_ghash_str_new("nodetypes_hash gh");
|
nodetypes_hash = BLI_ghash_str_new("nodetypes_hash gh");
|
||||||
@ -4690,7 +4690,7 @@ void init_nodesystem(void)
|
|||||||
registerFunctionNodes();
|
registerFunctionNodes();
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_nodesystem(void)
|
void BKE_node_system_exit(void)
|
||||||
{
|
{
|
||||||
if (nodetypes_hash) {
|
if (nodetypes_hash) {
|
||||||
NODE_TYPES_BEGIN (nt) {
|
NODE_TYPES_BEGIN (nt) {
|
||||||
|
@ -514,7 +514,7 @@ unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT];
|
|||||||
unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT];
|
unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT];
|
||||||
float PSYS_FRAND_BASE[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 */
|
RNG *rng = BLI_rng_new_srandom(5831); /* arbitrary */
|
||||||
for (int i = 0; i < PSYS_FRAND_COUNT; i++) {
|
for (int i = 0; i < PSYS_FRAND_COUNT; i++) {
|
||||||
|
@ -73,7 +73,7 @@ void BlendfileLoadingBaseTest::SetUpTestCase()
|
|||||||
BKE_modifier_init();
|
BKE_modifier_init();
|
||||||
DEG_register_node_types();
|
DEG_register_node_types();
|
||||||
RNA_init();
|
RNA_init();
|
||||||
init_nodesystem();
|
BKE_node_system_init();
|
||||||
|
|
||||||
G.background = true;
|
G.background = true;
|
||||||
G.factory_startup = true;
|
G.factory_startup = true;
|
||||||
|
@ -437,8 +437,8 @@ int main(int argc,
|
|||||||
RNA_init();
|
RNA_init();
|
||||||
|
|
||||||
RE_engines_init();
|
RE_engines_init();
|
||||||
init_nodesystem();
|
BKE_node_system_init();
|
||||||
psys_init_rng();
|
BKE_particle_init_rng();
|
||||||
/* End second initialization. */
|
/* End second initialization. */
|
||||||
|
|
||||||
#if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
|
#if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
|
||||||
|
Loading…
Reference in New Issue
Block a user