Skip to content

Commit 2356baf

Browse files
committed
new demo version 0.6.1!
1 parent 6100c56 commit 2356baf

19 files changed

+367
-124
lines changed

README.md

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

99
### Getting Started
1010

11-
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.6.0_demo_(24_nov_2022.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.6.0/FLIP_Fluids_addon_0.6.0_demo_.24_nov_2022.zip)
11+
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.6.1_demo_(06_jan_2023.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.6.1/FLIP_Fluids_addon_0.6.1_demo_.06_jan_2023.zip)
1212

1313
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.
1414

1515
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)!
1616

1717
### Have any questions?
1818

19-
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!
19+
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!

__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def draw(self, context):
6666
column.operator(
6767
"wm.url_open",
6868
text="Purchase the FLIP Fluids addon on FlippedNormals",
69-
).url = "https://flippednormals.com/downloads/the-flip-fluids-addon-for-blender/ref/FLIPFluids/"
69+
).url = "https://flippednormals.com/product/the-flip-fluids-addon-for-blender-16173?dst=4DxRZXXT"
7070

7171

7272
def register():

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 6)
56-
set(FLUIDENGINE_VERSION_REVISION 0)
57-
set(FLUIDENGINE_VERSION_DATE "24-NOV-2022")
56+
set(FLUIDENGINE_VERSION_REVISION 1)
57+
set(FLUIDENGINE_VERSION_DATE "06-JAN-2022")
5858

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

src/addon/bake.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,8 @@ def __initialize_fluid_simulation_settings(fluidsim, data):
10041004
fluidsim.surface_tension_condition_number = surface_tension_number
10051005

10061006
is_sheet_seeding_enabled = __get_parameter_data(world.enable_sheet_seeding, frameno)
1007+
fluidsim.enable_sheet_seeding = is_sheet_seeding_enabled
10071008
if is_sheet_seeding_enabled:
1008-
fluidsim.enable_sheet_seeding = is_sheet_seeding_enabled
10091009
fluidsim.sheet_fill_rate = __get_parameter_data(world.sheet_fill_rate, frameno, value_min=0.0, value_max=1.0)
10101010
threshold = __get_parameter_data(world.sheet_fill_threshold, frameno, value_min=0.0, value_max=1.0)
10111011
fluidsim.sheet_fill_threshold = threshold - 1
@@ -1111,6 +1111,11 @@ def __initialize_fluid_simulation_settings(fluidsim, data):
11111111
fluidsim.jitter_surface_marker_particles = \
11121112
__get_parameter_data(advanced.jitter_surface_particles, frameno)
11131113

1114+
fluidsim.pressure_solver_max_iterations = \
1115+
__get_parameter_data(advanced.pressure_solver_max_iterations, frameno)
1116+
fluidsim.viscosity_solver_max_iterations = \
1117+
__get_parameter_data(advanced.viscosity_solver_max_iterations, frameno)
1118+
11141119
velocity_transfer_method = __get_parameter_data(advanced.velocity_transfer_method, frameno)
11151120
if velocity_transfer_method == 'VELOCITY_TRANSFER_METHOD_FLIP':
11161121
fluidsim.set_velocity_transfer_method_FLIP()
@@ -1862,10 +1867,10 @@ def __update_animatable_domain_properties(fluidsim, data, frameno):
18621867
__set_property(fluidsim, 'surface_tension', 0.0)
18631868

18641869
is_sheet_seeding_enabled = __get_parameter_data(world.enable_sheet_seeding, frameno)
1870+
__set_property(fluidsim, 'enable_sheet_seeding', is_sheet_seeding_enabled)
18651871
if is_sheet_seeding_enabled:
18661872
sheet_fill_rate = __get_parameter_data(world.sheet_fill_rate, frameno)
18671873
threshold = __get_parameter_data(world.sheet_fill_threshold, frameno)
1868-
__set_property(fluidsim, 'enable_sheet_seeding', is_sheet_seeding_enabled)
18691874
__set_property(fluidsim, 'sheet_fill_rate', sheet_fill_rate, value_min=0, value_max=1.0)
18701875
__set_property(fluidsim, 'sheet_fill_threshold', threshold - 1, value_min=-1.0, value_max=0.0)
18711876

@@ -1948,6 +1953,12 @@ def __update_animatable_domain_properties(fluidsim, data, frameno):
19481953
jitter_surface = __get_parameter_data(advanced.jitter_surface_particles, frameno)
19491954
__set_property(fluidsim, 'jitter_surface_marker_particles', jitter_surface)
19501955

1956+
pressure_solver_iterations = __get_parameter_data(advanced.pressure_solver_max_iterations, frameno)
1957+
__set_property(fluidsim, 'pressure_solver_max_iterations', pressure_solver_iterations)
1958+
1959+
viscosity_solver_iterations = __get_parameter_data(advanced.viscosity_solver_max_iterations, frameno)
1960+
__set_property(fluidsim, 'viscosity_solver_max_iterations', viscosity_solver_iterations)
1961+
19511962
PICFLIP_ratio = __get_parameter_data(advanced.PICFLIP_ratio, frameno)
19521963
__set_property(fluidsim, 'PICFLIP_ratio', PICFLIP_ratio)
19531964

src/addon/objects/flip_fluid_cache.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -611,9 +611,10 @@ def load_frame(self, frameno, force_load=False, depsgraph=None):
611611
self.current_loaded_frame = render.get_current_render_frame()
612612
self._commit_loaded_frame_data(frameno)
613613

614-
use_persistent_data = bpy.context.scene.render.use_persistent_data
615614
if vcu.is_blender_279() or render.is_rendering():
616-
if not use_persistent_data:
615+
use_persistent_data = bpy.context.scene.render.use_persistent_data
616+
is_keyframed_hide_render = render.is_keyframed_hide_render_issue_relevant()
617+
if not use_persistent_data and not is_keyframed_hide_render:
617618
# Updating depsgraph when 'Persistent Data' option is enabled
618619
# causes incorrect render. Note: ignoring the depsgraph update
619620
# can result in more frequent render crashes.

src/addon/operators/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,5 @@ def unregister():
9090
draw_grid_operators.unregister()
9191
draw_particles_operators.unregister()
9292
draw_force_field_operators.unregister()
93+
helper_operators.unregister()
9394
support_operators.unregister()

0 commit comments

Comments
 (0)