diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 02:00:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 02:00:45 +0300 |
| commit | 9c82eac2c8786d5bda0a63932f30691a64b30559 (patch) | |
| tree | ca02dccc79a6a5bd68ed574991446f661e633305 /source/blender/makesrna | |
| parent | 5d1245cca9e50a0e124f12b2f58b4ca362c1b4cb (diff) | |
Cleanup: use BKE_fluid prefix for fluid API
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_fluid.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_gpencil_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index 44cfa99aa13..11897ab5e2a 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -91,7 +91,7 @@ static void rna_Fluid_reset(Main *bmain, Scene *scene, PointerRNA *ptr) # ifdef WITH_FLUID { FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data; - fluidModifier_reset(settings->mmd); + BKE_fluid_modifier_reset(settings->mmd); } # endif @@ -105,7 +105,7 @@ static void rna_Fluid_reset_dependency(Main *bmain, Scene *scene, PointerRNA *pt FluidDomainSettings *settings = (FluidDomainSettings *)ptr->data; # ifdef WITH_FLUID - fluidModifier_reset(settings->mmd); + BKE_fluid_modifier_reset(settings->mmd); # endif if (settings->mmd && settings->mmd->domain) { @@ -1597,7 +1597,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Fractional Obstacles", - "Fractional obstacles improve and smoothen the fluid-obstacle boundary."); + "Fractional obstacles improve and smoothen the fluid-obstacle boundary"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_resetCache"); prop = RNA_def_property(srna, "fractions_threshold", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 59baf7e4cbf..2f59cde7e94 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -43,7 +43,7 @@ #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" #include "BKE_multires.h" -#include "BKE_fluid.h" /* For fluidModifier_free & fluidModifier_createType */ +#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d83d85591d7..0aa3cc1ea94 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -45,7 +45,7 @@ #include "BKE_mesh_remap.h" #include "BKE_multires.h" #include "BKE_ocean.h" -#include "BKE_fluid.h" /* For fluidModifier_free & fluidModifier_createType */ +#include "BKE_fluid.h" /* For BKE_fluid_modifier_free & BKE_fluid_modifier_create_type_data */ #include "RNA_access.h" #include "RNA_define.h" @@ -1038,8 +1038,8 @@ static void rna_fluid_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) } # ifdef WITH_FLUID - fluidModifier_free(mmd); /* XXX TODO: completely free all 3 pointers */ - fluidModifier_createType(mmd); /* create regarding of selected type */ + BKE_fluid_modifier_free(mmd); /* XXX TODO: completely free all 3 pointers */ + BKE_fluid_modifier_create_type_data(mmd); /* create regarding of selected type */ # endif switch (mmd->type) { |