[Bf-blender-cvs] [ca277d7d607] master: Cleanup: renaming guiding -> guide
Campbell Barton
noreply at git.blender.org
Tue Dec 17 04:08:23 CET 2019
Commit: ca277d7d6073b0ead3c38c028ab74b05d5728fea
Author: Campbell Barton
Date: Tue Dec 17 14:00:19 2019 +1100
Branches: master
https://developer.blender.org/rBca277d7d6073b0ead3c38c028ab74b05d5728fea
Cleanup: renaming guiding -> guide
The term guide makes sense on it's own in this context.
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M source/blender/blenkernel/intern/fluid.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/physics/physics_intern.h
M source/blender/editors/physics/physics_ops.c
M source/blender/makesdna/DNA_fluid_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/modifiers/intern/MOD_fluid.c
===================================================================
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index a93242b29b9..6c252f9f8e4 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -70,7 +70,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
mUsingObstacle = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE);
mUsingInvel = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL);
mUsingOutflow = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OUTFLOW);
- mUsingGuiding = (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDING);
+ mUsingGuiding = (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDE);
// Simulation constants
mTempAmb = 0; // TODO: Maybe use this later for buoyancy calculation
@@ -200,7 +200,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
}
if (mUsingGuiding) {
- mResGuiding = (mmd->domain->guiding_parent) ? mmd->domain->guide_res : mmd->domain->res;
+ mResGuiding = (mmd->domain->guide_parent) ? mmd->domain->guide_res : mmd->domain->res;
initGuiding(mmd);
}
if (mUsingFractions) {
@@ -226,7 +226,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
initOutflow(mmd);
if (mUsingGuiding) {
- mResGuiding = (mmd->domain->guiding_parent) ? mmd->domain->guide_res : mmd->domain->res;
+ mResGuiding = (mmd->domain->guide_parent) ? mmd->domain->guide_res : mmd->domain->res;
initGuiding(mmd);
}
@@ -603,7 +603,7 @@ std::string MANTA::getRealValue(const std::string &varName, FluidModifierData *m
else if (varName == "USING_OBSTACLE")
ss << (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE ? "True" : "False");
else if (varName == "USING_GUIDING")
- ss << (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDING ? "True" : "False");
+ ss << (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDE ? "True" : "False");
else if (varName == "USING_INVEL")
ss << (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL ? "True" : "False");
else if (varName == "USING_OUTFLOW")
@@ -920,11 +920,11 @@ std::string MANTA::getRealValue(const std::string &varName, FluidModifierData *m
ss << (((mmd->domain->particle_type & tmpVar)) ? "True" : "False");
}
else if (varName == "GUIDING_ALPHA")
- ss << mmd->domain->guiding_alpha;
+ ss << mmd->domain->guide_alpha;
else if (varName == "GUIDING_BETA")
- ss << mmd->domain->guiding_beta;
+ ss << mmd->domain->guide_beta;
else if (varName == "GUIDING_FACTOR")
- ss << mmd->domain->guiding_vel_factor;
+ ss << mmd->domain->guide_vel_factor;
else if (varName == "GRAVITY_X")
ss << mmd->domain->gravity[0];
else if (varName == "GRAVITY_Y")
@@ -1535,7 +1535,7 @@ int MANTA::readGuiding(FluidModifierData *mmd, int framenr, bool sourceDomain)
targetFile[0] = '\0';
std::string gformat = getCacheFileEnding(mmd->domain->cache_data_format);
- const char *subdir = (sourceDomain) ? FLUID_DOMAIN_DIR_DATA : FLUID_DOMAIN_DIR_GUIDING;
+ const char *subdir = (sourceDomain) ? FLUID_DOMAIN_DIR_DATA : FLUID_DOMAIN_DIR_GUIDE;
BLI_path_join(
cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, subdir, NULL);
@@ -1590,7 +1590,7 @@ int MANTA::bakeData(FluidModifierData *mmd, int framenr)
BLI_path_join(cacheDirGuiding,
sizeof(cacheDirGuiding),
mmd->domain->cache_directory,
- FLUID_DOMAIN_DIR_GUIDING,
+ FLUID_DOMAIN_DIR_GUIDE,
NULL);
BLI_path_make_safe(cacheDirData);
BLI_path_make_safe(cacheDirGuiding);
@@ -1736,7 +1736,7 @@ int MANTA::bakeGuiding(FluidModifierData *mmd, int framenr)
BLI_path_join(cacheDirGuiding,
sizeof(cacheDirGuiding),
mmd->domain->cache_directory,
- FLUID_DOMAIN_DIR_GUIDING,
+ FLUID_DOMAIN_DIR_GUIDE,
NULL);
BLI_path_make_safe(cacheDirGuiding);
@@ -1804,7 +1804,7 @@ void MANTA::exportSmokeScript(FluidModifierData *mmd)
bool colors = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_COLORS;
bool fire = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_FIRE;
bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE;
- bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDING;
+ bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE;
bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL;
std::string manta_script;
@@ -1912,7 +1912,7 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd)
bool floater = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM;
bool tracer = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER;
bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE;
- bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDING;
+ bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE;
bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL;
std::string manta_script;
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 3327d6b979f..b46a54fc143 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -133,8 +133,8 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
if md.fluid_type == 'DOMAIN':
domain = md.domain_settings
- # Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.has_cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
+ # Deactivate UI if guides are enabled but not baked yet.
+ layout.active = not (domain.use_guide and not domain.has_cache_baked_guide and (domain.guide_source == 'EFFECTOR' or (domain.guide_source == 'DOMAIN' and not domain.guide_parent)))
is_baking_any = domain.is_cache_baking_any
has_baked_data = domain.has_cache_baked_data
@@ -237,7 +237,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
if effec.effec_type == 'GUIDE':
col.prop(effec, "velocity_factor", text="Velocity Factor")
col = flow.column()
- col.prop(effec, "guiding_mode", text="Guiding Mode")
+ col.prop(effec, "guide_mode", text="Guide Mode")
class PHYSICS_PT_borders(PhysicButtonsPanel, Panel):
@@ -643,8 +643,8 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
- # Deactivate UI if guiding is enabled but not baked yet
- layout.active = domain.use_noise and not (domain.use_guiding and not domain.has_cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
+ # Deactivate UI if guides are enabled but not baked yet.
+ layout.active = domain.use_noise and not (domain.use_guide and not domain.has_cache_baked_guide and (domain.guide_source == 'EFFECTOR' or (domain.guide_source == 'DOMAIN' and not domain.guide_parent)))
is_baking_any = domain.is_cache_baking_any
has_baked_noise = domain.has_cache_baked_noise
@@ -709,8 +709,8 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
- # Deactivate UI if guiding is enabled but not baked yet
- layout.active = domain.use_mesh and not (domain.use_guiding and not domain.has_cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
+ # Deactivate UI if guides are enabled but not baked yet.
+ layout.active = domain.use_mesh and not (domain.use_guide and not domain.has_cache_baked_guide and (domain.guide_source == 'EFFECTOR' or (domain.guide_source == 'DOMAIN' and not domain.guide_parent)))
is_baking_any = domain.is_cache_baking_any
has_baked_mesh = domain.has_cache_baked_mesh
@@ -781,8 +781,8 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
- # Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.has_cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
+ # Deactivate UI if guides are enabled but not baked yet.
+ layout.active = not (domain.use_guide and not domain.has_cache_baked_guide and (domain.guide_source == 'EFFECTOR' or (domain.guide_source == 'DOMAIN' and not domain.guide_parent)))
is_baking_any = domain.is_cache_baking_any
has_baked_particles = domain.has_cache_baked_particles
@@ -888,8 +888,8 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
- # Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.has_cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
+ # Deactivate UI if guides are enabled but not baked yet.
+ layout.active = not (domain.use_guide and not domain.has_cache_baked_guide and (domain.guide_source == 'EFFECTOR' or (domain.guide_source == 'DOMAIN' and not domain.guide_parent)))
is_baking_any = domain.is_cache_baking_any
has_baked_any = domain.has_cache_baked_any
@@ -917,8 +917,8 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel):
col.prop(domain, "surface_tension", text="Surface Tension")
-class PHYSICS_PT_guiding(PhysicButtonsPanel, Panel):
- bl_label = "Guiding"
+class PHYSICS_PT_guide(PhysicButtonsPanel, Panel):
+ bl_label = "Guides"
bl_parent_id = 'PHYSICS_PT_fluid'
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
@@ -937,7 +937,7 @@ class
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list