diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-15 19:26:57 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-15 19:29:01 +0300 |
commit | f15d810b1fb7c995ee5b3a37e569db47041c393f (patch) | |
tree | 2db89acfdbfae4f8b803407824c03c0b74887f2f /source/blender/blenkernel/intern/pointcache.c | |
parent | f5ac1f444b6b3f03f65dd9ba5f44c6c46c12fb98 (diff) |
Cleanup: Naming, BKE prefix
Done for smoke functions.
Smoke modifier functions seems an oddballs here,
but probably also to be renamed.
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 5be0b083d5b..ada254ba77e 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -580,7 +580,7 @@ static int ptcache_smoke_write(PTCacheFile *pf, void *smoke_v) SmokeModifierData *smd= (SmokeModifierData *)smoke_v; SmokeDomainSettings *sds = smd->domain; int ret = 0; - int fluid_fields = smoke_get_data_flags(sds); + int fluid_fields = BKE_smoke_get_data_flags(sds); /* version header */ ptcache_file_write(pf, SMOKE_CACHE_VERSION, 4, sizeof(char)); @@ -698,7 +698,7 @@ static int ptcache_smoke_read_old(PTCacheFile *pf, void *smoke_v) unsigned char *obstacles; float *tmp_array = MEM_callocN(out_len, "Smoke old cache tmp"); - int fluid_fields = smoke_get_data_flags(sds); + int fluid_fields = BKE_smoke_get_data_flags(sds); /* Part part of the new cache header */ sds->active_color[0] = 0.7f; @@ -767,7 +767,7 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v) char version[4]; int ch_res[3]; float ch_dx; - int fluid_fields = smoke_get_data_flags(sds); + int fluid_fields = BKE_smoke_get_data_flags(sds); int cache_fields = 0; int active_fields = 0; int reallocate = 0; @@ -805,12 +805,12 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v) /* reallocate fluid if needed*/ if (reallocate) { sds->active_fields = active_fields | cache_fields; - smoke_reallocate_fluid(sds, ch_dx, ch_res, 1); + BKE_smoke_reallocate_fluid(sds, ch_dx, ch_res, 1); sds->dx = ch_dx; copy_v3_v3_int(sds->res, ch_res); sds->total_cells = ch_res[0]*ch_res[1]*ch_res[2]; if (sds->flags & MOD_SMOKE_HIGHRES) { - smoke_reallocate_highres_fluid(sds, ch_dx, ch_res, 1); + BKE_smoke_reallocate_highres_fluid(sds, ch_dx, ch_res, 1); } } @@ -959,7 +959,7 @@ static int ptcache_smoke_openvdb_write(struct OpenVDBWriter *writer, void *smoke OpenVDBWriter_add_meta_v3(writer, "blender/smoke/active_color", sds->active_color); OpenVDBWriter_add_meta_mat4(writer, "blender/smoke/obmat", sds->obmat); - int fluid_fields = smoke_get_data_flags(sds); + int fluid_fields = BKE_smoke_get_data_flags(sds); struct OpenVDBFloatGrid *clip_grid = NULL; @@ -1042,7 +1042,7 @@ static int ptcache_smoke_openvdb_read(struct OpenVDBReader *reader, void *smoke_ SmokeDomainSettings *sds = smd->domain; - int fluid_fields = smoke_get_data_flags(sds); + int fluid_fields = BKE_smoke_get_data_flags(sds); int active_fields, cache_fields = 0; int cache_res[3]; float cache_dx; @@ -1084,13 +1084,13 @@ static int ptcache_smoke_openvdb_read(struct OpenVDBReader *reader, void *smoke_ /* reallocate fluid if needed*/ if (reallocate) { sds->active_fields = active_fields | cache_fields; - smoke_reallocate_fluid(sds, cache_dx, cache_res, 1); + BKE_smoke_reallocate_fluid(sds, cache_dx, cache_res, 1); sds->dx = cache_dx; copy_v3_v3_int(sds->res, cache_res); sds->total_cells = cache_res[0] * cache_res[1] * cache_res[2]; if (sds->flags & MOD_SMOKE_HIGHRES) { - smoke_reallocate_highres_fluid(sds, cache_dx, cache_res, 1); + BKE_smoke_reallocate_highres_fluid(sds, cache_dx, cache_res, 1); } } |