diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-14 11:30:11 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-14 11:41:00 +0300 |
commit | 13769bcbe5ccce70736ff73107d9284396043379 (patch) | |
tree | 62a1528e060b9a16e549a889974b2194f646ee06 /source/blender/editors | |
parent | de6a86611440568277dce1ea91135dc9611224ff (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 'source/blender/editors')
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 3e9d2def78e..1a5b3d6ac45 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -336,7 +336,7 @@ set(ICON_NAMES force_boid force_turbulence force_drag - force_smokeflow + force_fluidflow image_plane image_background image_reference diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 6fdef4a06e0..452a1fca111 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -428,7 +428,7 @@ DEF_ICON(FORCE_CURVE) DEF_ICON(FORCE_BOID) DEF_ICON(FORCE_TURBULENCE) DEF_ICON(FORCE_DRAG) -DEF_ICON(FORCE_SMOKEFLOW) +DEF_ICON(FORCE_FLUIDFLOW) DEF_ICON_BLANK(673) DEF_ICON_BLANK(674) DEF_ICON(RIGID_BODY) diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 0e609b5e903..74fba4d0cf9 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -146,7 +146,7 @@ static const EnumPropertyItem field_type_items[] = { {PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", ""}, {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", ""}, {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", ""}, - {PFIELD_SMOKEFLOW, "SMOKE", ICON_FORCE_SMOKEFLOW, "Smoke Flow", ""}, + {PFIELD_FLUIDFLOW, "FLUID", ICON_FORCE_FLUIDFLOW, "Fluid Flow", ""}, {0, NULL, 0, NULL, NULL}, }; |