[Bf-blender-cvs] [9c82eac2c87] master: Cleanup: use BKE_fluid prefix for fluid API
Campbell Barton
noreply at git.blender.org
Tue Dec 17 00:01:53 CET 2019
Commit: 9c82eac2c8786d5bda0a63932f30691a64b30559
Author: Campbell Barton
Date: Tue Dec 17 10:00:45 2019 +1100
Branches: master
https://developer.blender.org/rB9c82eac2c8786d5bda0a63932f30691a64b30559
Cleanup: use BKE_fluid prefix for fluid API
===================================================================
M source/blender/blenkernel/BKE_fluid.h
M source/blender/blenkernel/intern/fluid.c
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_fluid.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_fluid.h b/source/blender/blenkernel/BKE_fluid.h
index 8ada379a293..881653dc5ee 100644
--- a/source/blender/blenkernel/BKE_fluid.h
+++ b/source/blender/blenkernel/BKE_fluid.h
@@ -28,21 +28,21 @@ struct Scene;
struct FluidDomainSettings;
struct FluidModifierData;
-typedef float (*bresenham_callback)(
+typedef float (*BKE_Fluid_BresenhamFn)(
float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
-struct Mesh *fluidModifier_do(struct FluidModifierData *mmd,
- struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- struct Mesh *me);
+struct Mesh *BKE_fluid_modifier_do(struct FluidModifierData *mmd,
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ struct Mesh *me);
-void fluidModifier_free(struct FluidModifierData *mmd);
-void fluidModifier_reset(struct FluidModifierData *mmd);
-void fluidModifier_createType(struct FluidModifierData *mmd);
-void fluidModifier_copy(const struct FluidModifierData *mmd,
- struct FluidModifierData *tmmd,
- const int flag);
+void BKE_fluid_modifier_free(struct FluidModifierData *mmd);
+void BKE_fluid_modifier_reset(struct FluidModifierData *mmd);
+void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd);
+void BKE_fluid_modifier_copy(const struct FluidModifierData *mmd,
+ struct FluidModifierData *tmmd,
+ const int flag);
void BKE_fluid_reallocate_fluid(struct FluidDomainSettings *mds, int res[3], int free_old);
void BKE_fluid_reallocate_copy_fluid(struct FluidDomainSettings *mds,
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index c33d38d15d6..a996b8e8cd3 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -487,7 +487,7 @@ static void manta_set_domain_gravity(Scene *scene, FluidDomainSettings *mds)
}
}
-static bool fluidModifier_init(
+static bool BKE_fluid_modifier_init(
FluidModifierData *mmd, Depsgraph *depsgraph, Object *ob, Scene *scene, Mesh *me)
{
int scene_framenr = (int)DEG_get_ctime(depsgraph);
@@ -537,14 +537,14 @@ static bool fluidModifier_init(
}
else if (mmd->type & MOD_FLUID_TYPE_FLOW) {
if (!mmd->flow) {
- fluidModifier_createType(mmd);
+ BKE_fluid_modifier_create_type_data(mmd);
}
mmd->time = scene_framenr;
return true;
}
else if (mmd->type & MOD_FLUID_TYPE_EFFEC) {
if (!mmd->effector) {
- fluidModifier_createType(mmd);
+ BKE_fluid_modifier_create_type_data(mmd);
}
mmd->time = scene_framenr;
return true;
@@ -552,7 +552,7 @@ static bool fluidModifier_init(
return false;
}
-static void fluidModifier_freeDomain(FluidModifierData *mmd)
+static void BKE_fluid_modifier_freeDomain(FluidModifierData *mmd)
{
if (mmd->domain) {
if (mmd->domain->fluid) {
@@ -587,7 +587,7 @@ static void fluidModifier_freeDomain(FluidModifierData *mmd)
}
}
-static void fluidModifier_freeFlow(FluidModifierData *mmd)
+static void BKE_fluid_modifier_freeFlow(FluidModifierData *mmd)
{
if (mmd->flow) {
if (mmd->flow->mesh) {
@@ -606,7 +606,7 @@ static void fluidModifier_freeFlow(FluidModifierData *mmd)
}
}
-static void fluidModifier_freeEffector(FluidModifierData *mmd)
+static void BKE_fluid_modifier_freeEffector(FluidModifierData *mmd)
{
if (mmd->effector) {
if (mmd->effector->mesh) {
@@ -625,7 +625,7 @@ static void fluidModifier_freeEffector(FluidModifierData *mmd)
}
}
-static void fluidModifier_reset_ex(struct FluidModifierData *mmd, bool need_lock)
+static void BKE_fluid_modifier_reset_ex(struct FluidModifierData *mmd, bool need_lock)
{
if (!mmd) {
return;
@@ -665,23 +665,23 @@ static void fluidModifier_reset_ex(struct FluidModifierData *mmd, bool need_lock
}
}
-void fluidModifier_reset(struct FluidModifierData *mmd)
+void BKE_fluid_modifier_reset(struct FluidModifierData *mmd)
{
- fluidModifier_reset_ex(mmd, true);
+ BKE_fluid_modifier_reset_ex(mmd, true);
}
-void fluidModifier_free(FluidModifierData *mmd)
+void BKE_fluid_modifier_free(FluidModifierData *mmd)
{
if (!mmd) {
return;
}
- fluidModifier_freeDomain(mmd);
- fluidModifier_freeFlow(mmd);
- fluidModifier_freeEffector(mmd);
+ BKE_fluid_modifier_freeDomain(mmd);
+ BKE_fluid_modifier_freeFlow(mmd);
+ BKE_fluid_modifier_freeEffector(mmd);
}
-void fluidModifier_createType(struct FluidModifierData *mmd)
+void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd)
{
if (!mmd) {
return;
@@ -689,7 +689,7 @@ void fluidModifier_createType(struct FluidModifierData *mmd)
if (mmd->type & MOD_FLUID_TYPE_DOMAIN) {
if (mmd->domain) {
- fluidModifier_freeDomain(mmd);
+ BKE_fluid_modifier_freeDomain(mmd);
}
/* domain object data */
@@ -862,7 +862,7 @@ void fluidModifier_createType(struct FluidModifierData *mmd)
}
else if (mmd->type & MOD_FLUID_TYPE_FLOW) {
if (mmd->flow) {
- fluidModifier_freeFlow(mmd);
+ BKE_fluid_modifier_freeFlow(mmd);
}
/* flow object data */
@@ -905,7 +905,7 @@ void fluidModifier_createType(struct FluidModifierData *mmd)
}
else if (mmd->type & MOD_FLUID_TYPE_EFFEC) {
if (mmd->effector) {
- fluidModifier_freeEffector(mmd);
+ BKE_fluid_modifier_freeEffector(mmd);
}
/* effector object data */
@@ -924,14 +924,14 @@ void fluidModifier_createType(struct FluidModifierData *mmd)
}
}
-void fluidModifier_copy(const struct FluidModifierData *mmd,
- struct FluidModifierData *tmmd,
- const int flag)
+void BKE_fluid_modifier_copy(const struct FluidModifierData *mmd,
+ struct FluidModifierData *tmmd,
+ const int flag)
{
tmmd->type = mmd->type;
tmmd->time = mmd->time;
- fluidModifier_createType(tmmd);
+ BKE_fluid_modifier_create_type_data(tmmd);
if (tmmd->domain) {
FluidDomainSettings *tmds = tmmd->domain;
@@ -4055,15 +4055,15 @@ static void manta_guiding(
BLI_mutex_unlock(&object_update_lock);
}
-static void fluidModifier_processFlow(FluidModifierData *mmd,
- Depsgraph *depsgraph,
- Scene *scene,
- Object *ob,
- Mesh *me,
- const int scene_framenr)
+static void BKE_fluid_modifier_processFlow(FluidModifierData *mmd,
+ Depsgraph *depsgraph,
+ Scene *scene,
+ Object *ob,
+ Mesh *me,
+ const int scene_framenr)
{
if (scene_framenr >= mmd->time) {
- fluidModifier_init(mmd, depsgraph, ob, scene, me);
+ BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me);
}
if (mmd->flow) {
@@ -4078,19 +4078,19 @@ static void fluidModifier_processFlow(FluidModifierData *mmd,
}
else if (scene_framenr < mmd->time) {
mmd->time = scene_framenr;
- fluidModifier_reset_ex(mmd, false);
+ BKE_fluid_modifier_reset_ex(mmd, false);
}
}
-static void fluidModifier_processEffector(FluidModifierData *mmd,
- Depsgraph *depsgraph,
- Scene *scene,
- Object *ob,
- Mesh *me,
- const int scene_framenr)
+static void BKE_fluid_modifier_processEffector(FluidModifierData *mmd,
+ Depsgraph *depsgraph,
+ Scene *scene,
+ Object *ob,
+ Mesh *me,
+ const int scene_framenr)
{
if (scene_framenr >= mmd->time) {
- fluidModifier_init(mmd, depsgraph, ob, scene, me);
+ BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me);
}
if (mmd->effector) {
@@ -4105,16 +4105,16 @@ static void fluidModifier_processEffector(FluidModifierData *mmd,
}
else if (scene_framenr < mmd->time) {
mmd->time = scene_framenr;
- fluidModifier_reset_ex(mmd, false);
+ BKE_fluid_modifier_reset_ex(mmd, false);
}
}
-static void fluidModifier_processDomain(FluidModifierData *mmd,
- Depsgraph *depsgraph,
- Scene *scene,
- Object *ob,
- Mesh *me,
- const int scene_framenr)
+static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
+ Depsgraph *depsgraph,
+ Scene *scene,
+ Object *ob,
+ Mesh *me,
+ const int scene_framenr)
{
FluidDomainSettings *mds = mmd->domain;
Object *guiding_parent = NULL;
@@ -4128,10 +4128,10 @@ static void fluidModifier_processDomain(FluidModifierData *mmd,
/* Reset fluid if no fluid present (obviously)
* or if timeline gets reset to startframe */
if (!mds->fluid || is_startframe) {
- fluidModifier_reset_ex(mmd, false);
+ BKE_fluid_modifier_reset_ex(mmd, false);
}
- fluidModifier_init(mmd, depsgraph, ob, scene, me);
+ BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me);
/* ensure that time parameters are initialized correctly before every step */
float fps = scene->r.frs_sec / scene->r
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list