Skip to content

Commit db3393c

Browse files
committed
new demo version 0.7.2!
1 parent 48112c0 commit db3393c

File tree

98 files changed

+7939
-1752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7939
-1752
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Want to try the FLIP Fluids addon before buying the [full marketplace product](h
99

1010
### Getting Started
1111

12-
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.7.1_demo_(25_jul_2023.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.7.1/FLIP_Fluids_addon_0.7.1_demo_.25_jul_2023.zip)
12+
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.7.2_demo_(07_nov_2023.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.7.2/FLIP_Fluids_addon_0.7.2_demo_.07_nov_2023.zip)
1313

1414
After downloading the demo addon, follow our [Installation Instructions](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Addon-Installation-and-Uninstallation). The instructions are similar to installing any other Blender addon.
1515

1616
Get started creating your first simulation with our [beginners guide](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Creating-Your-First-FLIP-Fluids-Simulation) or [video learning series](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Video-Learning-Series)!
1717

1818
### Have any questions?
1919

20-
Feel free to send us a message on any of the [official marketplaces](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon), or send us an email at [email protected]. We're always glad to help!
20+
Feel free to send us a message on any of the [official marketplaces](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon), or send us an email at [email protected], or join the [FLIP Fluids Discord server](https://discord.gg/FLIPFluids). We're always glad to help!

cmake/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ set(CMAKE_BUILD_TYPE Release)
5353
set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD TRUE)
5454
set(FLUIDENGINE_VERSION_MAJOR 0)
5555
set(FLUIDENGINE_VERSION_MINOR 7)
56-
set(FLUIDENGINE_VERSION_REVISION 1)
57-
set(FLUIDENGINE_VERSION_DATE "25-JUL-2023")
56+
set(FLUIDENGINE_VERSION_REVISION 2)
57+
set(FLUIDENGINE_VERSION_DATE "07-NOV-2023")
5858

5959
if(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD)
6060
set(FLUIDENGINE_VERSION_TYPE_LABEL "Demo")

src/addon/bake.py

+305-39
Large diffs are not rendered by default.

src/addon/export.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,23 @@ def add_objects_to_geometry_exporter(geometry_exporter):
419419
props = obj.flip_fluid.get_property_group()
420420
export_object = __generate_export_object(obj)
421421

422+
is_dynamic_topology_exception = False
423+
if obj.flip_fluid.is_force_field():
424+
is_dynamic_topology_exception = True
425+
elif obj.flip_fluid.is_inflow():
426+
if not obj.flip_fluid.inflow.append_object_velocity:
427+
is_dynamic_topology_exception = True
428+
elif obj.flip_fluid.is_fluid():
429+
if not obj.flip_fluid.fluid.append_object_velocity:
430+
is_dynamic_topology_exception = True
431+
elif obj.flip_fluid.is_outflow():
432+
is_dynamic_topology_exception = True
433+
422434
skip_reexport = hasattr(props, "skip_reexport") and props.skip_reexport
423435
force_reexport = hasattr(props, "force_reexport_on_next_bake") and props.force_reexport_on_next_bake
424436
skip_reexport = skip_reexport and not force_reexport
425437
export_object.skip_reexport = skip_reexport and not force_reexport
426-
export_object.disable_changing_topology_warning = disable_topology_warning or obj.flip_fluid.is_force_field()
438+
export_object.disable_changing_topology_warning = disable_topology_warning or is_dynamic_topology_exception
427439
geometry_exporter.add_geometry_export_object(export_object)
428440

429441
# Add Fluid/Inflow target objects

src/addon/filesystem/filesystem_protection_layer.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
".cpp",
3030
".data",
3131
".ffd",
32+
".ffp3",
3233
".fpd",
3334
".h",
3435
".info",
@@ -206,7 +207,7 @@ def clear_cache_directory(cache_directory, clear_export=False, clear_logs=False,
206207
delete_file(stats_filepath)
207208

208209
bakefiles_dir = os.path.join(cache_directory, "bakefiles")
209-
extensions = [".bbox", ".bobj", ".data", ".wwp", ".wwf", ".wwi", ".fpd", ".ffd"]
210+
extensions = [".bbox", ".bobj", ".data", ".wwp", ".wwf", ".wwi", ".fpd", ".ffd", ".ffp3"]
210211
delete_files_in_directory(bakefiles_dir, extensions, remove_directory=True)
211212

212213
temp_dir = os.path.join(cache_directory, "temp")

src/addon/materials/LICENSE.md

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
The FLIP Fluids Material Library Blend files and containing materials in this directory
2+
and subdirectories are licensed under the MIT License:
3+
4+
--------------------------------------------------------------------------------
5+
6+
MIT License
7+
8+
Copyright (C) 2023 Ryan L. Guy
9+
10+
Permission is hereby granted, free of charge, to any person obtaining a copy
11+
of this software and associated documentation files (the "Software"), to deal
12+
in the Software without restriction, including without limitation the rights
13+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the Software is
15+
furnished to do so, subject to the following conditions:
16+
17+
The above copyright notice and this permission notice shall be included in all
18+
copies or substantial portions of the Software.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26+
SOFTWARE.
27+
28+
--------------------------------------------------------------------------------

src/addon/materials/material_library.py

+12
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ def get_surface_material_enums_ui(scene=None, context=None):
3434
return enums
3535

3636

37+
def get_fluid_particles_material_enums_ui(scene=None, context=None):
38+
bpy.context.scene.flip_fluid_material_library.check_icons_initialized()
39+
enums = []
40+
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_SURFACE')
41+
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_WHITEWATER')
42+
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_ALL')
43+
enums += __get_non_material_library_enums_by_type()
44+
enums += [__get_none_material_enum()]
45+
enums.reverse()
46+
return enums
47+
48+
3749
def get_whitewater_material_enums_ui(scene=None, context=None):
3850
bpy.context.scene.flip_fluid_material_library.check_icons_initialized()
3951
enums = []

0 commit comments

Comments
 (0)