Skip to content

Commit d0480a2

Browse files
committed
Updated for new FLIP Fluids demo!
1 parent 5833774 commit d0480a2

File tree

251 files changed

+10054
-3589
lines changed

Some content is hidden

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

251 files changed

+10054
-3589
lines changed

CMakeLists.txt

-153
This file was deleted.

LICENSE_MIT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2019 Ryan L. Guy
1+
Copyright (C) 2020 Ryan L. Guy
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ Want to try FLIP Fluids addon before buying the full [Blender Market Product](ht
22

33
### Limitations
44

5-
- Limited to simulating 250 frames of animation
5+
- _**New:**_ Unlimited simulation frames (previous limit of 250)
6+
- _**New:**_ Unlimited number of simulation objects (previous limit of 1 per object type)
67
- Simulation meshes are watermarked with _FLIP Fluids Demo_ text
7-
- Limited to one of each type of simulation object: Fluid, Inflow, Outflow, Obstacle
8-
- Material library and preset library features are not included
98

109
### Getting Started
1110

12-
Download the latest FLIP Fluids Demo installation file here: [flip_fluids_addon-0.0.8a_demo_05-mar-2020.zip](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.0.8a/flip_fluids_addon-0.0.8a_demo_05_mar_2020.zip)
11+
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.0.9_demo_(26_nov_2020).zip](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.0.9/FLIP_Fluids_addon_0.0.9_demo_(26_nov_2020).zip)
1312

1413
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.
1514

1615
Get started creating your first simulation with our [beginners guide](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Creating-Your-First-FLIP-Fluids-Simulation)!
1716

1817
### Have any questions?
1918

20-
Feel free to send us a message on the [Blender Market](https://blendermarket.com/products/flipfluids), or send us an email at flip.fluids@gmail.com. We're always glad to help!
19+
Feel free to send us a message on the [Blender Market](https://blendermarket.com/products/flipfluids), or send us an email at support@flipfluids.com. We're always glad to help!

__init__.py

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Blender FLIP Fluids Add-on
2+
# Copyright (C) 2020 Ryan L. Guy
3+
#
4+
# This program is free software: you can redistribute it and/or modify
5+
# it under the terms of the GNU General Public License as published by
6+
# the Free Software Foundation, either version 3 of the License, or
7+
# (at your option) any later version.
8+
#
9+
# This program is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
17+
"""
18+
This addon __init__.py file is not the actual FLIP Fluids addon. The purpose of this
19+
file is to inform the user that what they have installed is not an installation file
20+
and is not the correct way to install the FLIP Fluids addon.
21+
"""
22+
23+
bl_info = {
24+
"name" : "FLIP Fluids - This is not an installation file",
25+
"description": "The file you have installed is not an addon. Enable for more info.",
26+
"author" : "The FLIP Fluids Development Team",
27+
"version" : (0, 0, 0),
28+
"blender" : (2, 81, 0),
29+
"location" : "",
30+
"warning" : "",
31+
"wiki_url" : "https://github.com/rlguy/Blender-FLIP-Fluids",
32+
"tracker_url" : "",
33+
"category" : ""
34+
}
35+
36+
import bpy
37+
38+
39+
class FLIPFluidInfoAddonPreferences(bpy.types.AddonPreferences):
40+
bl_idname = __name__.split(".")[0]
41+
42+
def draw(self, context):
43+
column = self.layout.column(align=True)
44+
column.label(text="The file you have installed is not an addon.")
45+
column.label(text="This .zip file only contains the addon and simulation engine source code.")
46+
column.label(text="")
47+
column.label(text="The source code must be built and compiled for your system.")
48+
column.label(text="See the FLIP Fluids GitHub README for instructions.")
49+
column.operator(
50+
"wm.url_open",
51+
text="FLIP Fluids addon GitHub",
52+
).url = "https://github.com/rlguy/Blender-FLIP-Fluids"
53+
column.separator()
54+
column.operator(
55+
"wm.url_open",
56+
text="Try our FLIP Fluids Free Trial",
57+
).url = "https://github.com/rlguy/Blender-FLIP-Fluids/wiki/FLIP-Fluids-Demo-Addon"
58+
column.operator(
59+
"wm.url_open",
60+
text="Purchase the FLIP Fluids addon on the Blender Market",
61+
).url = "https://blendermarket.com/products/flipfluids"
62+
63+
64+
def register():
65+
bpy.utils.register_class(FLIPFluidInfoAddonPreferences)
66+
67+
68+
def unregister():
69+
bpy.utils.unregister_class(FLIPFluidInfoAddonPreferences)
70+

0 commit comments

Comments
 (0)