Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-05-14 11:30:11 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-05-14 11:41:00 +0300
commit13769bcbe5ccce70736ff73107d9284396043379 (patch)
tree62a1528e060b9a16e549a889974b2194f646ee06 /release
parentde6a86611440568277dce1ea91135dc9611224ff (diff)
Fluid: Rename smoke flow forces to fluid flow forces
Better to use more general term since in theory these forces can be used for smoke and liquid.
Diffstat (limited to 'release')
-rw-r--r--release/datafiles/blender_icons16/icon16_force_fluidflow.dat (renamed from release/datafiles/blender_icons16/icon16_force_smokeflow.dat)bin1048 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_force_fluidflow.dat (renamed from release/datafiles/blender_icons32/icon32_force_smokeflow.dat)bin4120 -> 4120 bytes
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_field.py2
3 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/blender_icons16/icon16_force_smokeflow.dat b/release/datafiles/blender_icons16/icon16_force_fluidflow.dat
index a5b978a80b1..a5b978a80b1 100644
--- a/release/datafiles/blender_icons16/icon16_force_smokeflow.dat
+++ b/release/datafiles/blender_icons16/icon16_force_fluidflow.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_force_smokeflow.dat b/release/datafiles/blender_icons32/icon32_force_fluidflow.dat
index 0553f2adac2..0553f2adac2 100644
--- a/release/datafiles/blender_icons32/icon32_force_smokeflow.dat
+++ b/release/datafiles/blender_icons32/icon32_force_fluidflow.dat
Binary files differ
diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index 00dc068a51a..d1ff1dc9f5e 100644
--- a/release/scripts/startup/bl_ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -123,7 +123,7 @@ class PHYSICS_PT_field_settings(PhysicButtonsPanel, Panel):
col.prop(field, "use_object_coords")
col.prop(field, "use_2d_force")
- elif field.type == 'SMOKE_FLOW':
+ elif field.type == 'FLUID_FLOW':
col = flow.column()
col.prop(field, "strength")
col.prop(field, "flow")