Daniel Genrich
e089c5a976
Bugfix [ #33467 ] Fluid Simulations Speed factor animated wrong result
...
Thanks to Brecht for providing a patch and example blend.
I changed and extended it a bit since there was another bug in that loop.
2012-12-11 13:02:42 +00:00
Daniel Genrich
ef67ddeba9
Bugfix [ #29186 ] Object contribute to fluid sim animation start earlier than keyframe
...
Also fix:
- Fluid simulation was always lagging 1 frame behind: E.g. the 250th frame in blender showed 249th frame of the fluid simulation.
Change:
- Animated enabled/disabled property only gets counted as "on" if value >= 1
Note that this bugfix should solve many problems with timings of animated fluid sim properties.
2012-11-23 05:00:07 +00:00
Campbell Barton
7deb8d8a26
code cleanup: spelling
2012-10-20 20:36:51 +00:00
Daniel Genrich
a580c891a7
Bugfix [ #32703 ] elbeem's isSimworldOk() will never return FALSE
...
Fixed as suggested by Campbell, thank you!
2012-10-09 13:09:03 +00:00
Daniel Genrich
24a00f14af
Fix compile errors on VC++ 2012 RC1.
...
Note: Compile still fails during ceres compile (namespace tr1 problems).
2012-07-27 18:18:13 +00:00
Campbell Barton
f5f25b81e8
style cleanup:
...
also fix for building ghost test and fix double free in one of the tests
2012-06-17 09:58:26 +00:00
Campbell Barton
be53fde9cd
code cleanup:
...
- remove duplicate includes
- blender builds with -Werror in C++ for fluids/smoke
2012-05-21 06:33:45 +00:00
Sergey Sharybin
7b31c3c198
Fix cosmetic typos
...
Patch provided by Matteo F. Vescovi, thanks!
2012-05-15 16:11:04 +00:00
Daniel Genrich
d8ae4b35f2
Patch [ #31264 ] Elbeem Fixes by Jason Wilkins.
...
Thank you for submitting!
2012-05-14 16:19:58 +00:00
Antony Riakiotakis
4e6590067d
revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too
2012-04-24 16:14:23 +00:00
Antony Riakiotakis
0db3c5f743
Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise.
2012-04-24 14:33:44 +00:00
Daniel Genrich
fb6ee37aa2
corrected more issues from [ #31069 ] Analyzing the Blender project with PVS-Studio.
...
Remark: I think that "!(nbored & CFBnd)" would be correct but it introduced other bugs so, I just quiet compiler warnings leaving the running system untouched.
2012-04-23 17:33:12 +00:00
Daniel Genrich
a164aa1ab6
Bugfix [ #30298 ] Fluid-Sytem does not work! (Part 2, Part 1 fixed by Brecht)
...
Canceling fluid simulation did not work when speed was zero.
2012-04-22 17:31:39 +00:00
Daniel Genrich
21f6bac0a3
Fix [ #30954 ] Fluid obstacle checkbox has no effect
...
Note: Supporting obstacles which can be enabled/disabled as animated propoerty is not likely to happen. So I marked this as "Won't fix"/TODO.
I also reverted last commit on this bug because it didn't work and disabled the property from UI to avoid confusion.
2012-04-21 22:09:09 +00:00
Daniel Genrich
c96be5c5f9
Bugfix [ #30954 ] Fluid obstacle checkbox has no effect
...
Needs testing for sideeffects.
If there are negative sideeffects, revert commit and mark as "will not fix"/"not supported"/"needs UI fix".
2012-04-15 10:31:38 +00:00
Campbell Barton
1f3df9e659
patch from Jochen Schmitt to get blender building with gcc4.7
2012-02-09 07:01:30 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Brecht Van Lommel
9520295ade
Fix #28416 : setting fluid simulation start time to anything other than zero
...
gave wrong results. Note how in this code it already incremented to the start
time and then incorrectly added it again. Patch by Chris Foster, thanks!
2011-09-29 14:18:01 +00:00
Daniel Salazar
7ff634b8ef
Reverting change to solver_relax.h from commit 40539, caused this nasty bug http://projects.blender.org/tracker/?func=detail&atid=498&aid=28748&group_id=9
...
I'd say better be careful with code so complex as the fluid sim!
2011-09-26 09:36:51 +00:00
Andrew Wiggin
7c46f1c4b7
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
2011-09-25 12:33:51 +00:00
Jens Verwiebe
a7891da84b
Fix fluid openMP not baking with some threadcounts
2011-09-23 09:26:03 +00:00
Campbell Barton
736884fbcb
quiet -Wundef warnings for cmake/gcc/elbeem
2011-09-12 00:55:27 +00:00
Daniel Genrich
5745f99dee
Elbeem / Fluidsim update:
...
a) Enable the possibility to remove the "air bubble" around submerged collision object. This feature is enabled as standard for new files. The code was found in elbeem by nudelZ, coded and provided by Nils Thürey (thanks!)
b) Old baked files gets deleted if a new bake gets started (were overwritten before and resulted in weird old bake + new bake mixture) (idea by nudelZ)
2011-06-12 23:51:30 +00:00
Campbell Barton
09da9d4393
cmake maintenance
...
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Nathan Letwory
d14216ed04
doxygen: intern/elbeem tagged
2011-02-25 10:51:01 +00:00
Campbell Barton
89c617a116
remove nan-makefiles
2011-01-30 15:29:22 +00:00
Campbell Barton
1bd0db59f4
use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.
...
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
2011-01-25 14:43:13 +00:00
Campbell Barton
5e382eb8e5
rename blenderlib to blender_add_lib
2010-12-22 23:09:30 +00:00
Campbell Barton
afacd18498
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
2010-12-08 08:43:06 +00:00
Campbell Barton
e8397e6193
include headers in cmake source, added a script to check for consistency, reporting missing headers & C files.
...
this is important so IDE's using CMake integration always get blender headers. - QtCreator & MSVC for eg, probably others too.
2010-11-29 04:35:56 +00:00
Campbell Barton
f383e2e0e6
Remove msvc build files which are not needed anymore.
2010-10-23 15:14:54 +00:00
Campbell Barton
c6976e7351
use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
...
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html
Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
2010-10-23 04:05:55 +00:00
Campbell Barton
97784a7186
fix for warnings & detecting opensource nouveau drivers.
2010-10-22 01:06:21 +00:00
Campbell Barton
dea59cc5eb
warning fixes and minor cmake changes.
2010-09-18 03:55:56 +00:00
Campbell Barton
4b40d73bfb
rename most scons build targets to match cmake
2010-08-25 04:30:47 +00:00
Campbell Barton
6464718083
rename some cmake build targets
2010-08-24 04:29:23 +00:00
Dalai Felinto
33ee3fc6fe
CMake fix for GCC 4.4.1 crash (on ubuntu 9.10 ) reported (on IRC) and fixed by Elia Sarti (vekoon)
...
(it was broken since rev. 27257.)
2010-03-28 21:38:22 +00:00
Dalai Felinto
790d6ca256
small png include adjustments (ifndef NOPNG ...).
...
* gameplayer is now probably not going to build without PNG turned ON.
To fix that it would be necessary to use #ifndef NOPNG around the GPC_Canvas::MakeScreenShot.
Since I don't this function it's working in 2.5 yet it's better to wait for that before doing it.
2010-03-03 19:34:17 +00:00
Campbell Barton
f09efddcda
fix for minor errors/warnings
2010-03-03 13:59:57 +00:00
Campbell Barton
081c1205a3
correct fsf address
2010-02-12 13:34:04 +00:00
Tom Musgrove
f2a8bb3498
this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
2010-02-01 18:39:41 +00:00
Damien Plisson
1975ee5eec
OSX vs OpenMP : implement workaround to fix crashes when using mop from a background thread
...
Fix# 20043 & 20392
The issue is that OSX lib does not implement TLS (Thread Local Storage), so libgomp uses pthread functions to read/write thread specific vars.
But this implementation is currently (gcc 4.2) buggy : the write function is called only at lib start (in main thread), and the var is undefined for background thread.
The workaround is to perform this gomp_tls_key var write at beginning of background threads that use openMP. (Currently: render & fluidsim)
2009-12-17 17:05:28 +00:00
Damien Plisson
5132b6a173
OSX: Disable parallel openMP for elbeem library until a proper fix is found (currently makes fluid sim crash) (Bug# 20043)
...
Thx Jens Verwiebe for the investigation!
2009-12-08 09:58:42 +00:00
Benoit Bolsee
1483fafd13
Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.
2009-09-24 21:22:24 +00:00
Campbell Barton
0a3694cd6e
white space commit. (2 spaces -> tab).
...
Was annoying to use a different editor for cmake only.
theeth says this should be ok with gsoc and merges from branches.
2009-09-06 01:51:23 +00:00
Brecht Van Lommel
314b14301f
2.5: warning fixes
...
Directories intern/ and source/blender/ now compile warning
free again here with scons/gcc.
2009-08-15 16:36:25 +00:00
Campbell Barton
9236f92dab
- remove UNSET becuase it only works with newer versions of cmake,
...
- changed the SDL and Freetype vars to match CMake's names
- removed unneeded freetype, SDL and ftgl includes
2009-08-15 13:30:28 +00:00
Daniel Genrich
dbba273371
Smoke: fixing some compile warning reported by Ton and one compile erro for gcc 4.4.1 reported by mrunion
2009-07-30 20:12:40 +00:00
Nathan Letwory
2e854ec7cf
SCons
...
* ensure all SConscripts are ready for win64-vc (where necessary).
* ensure we have proper _DEBUG flag for Python when we're doing a debug build.
* some cleaning up of linking etc.
* ensure /EHsc is there for game engine modules.
2009-07-16 19:41:28 +00:00
Brecht Van Lommel
874c29cea8
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
...
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
2009-04-20 15:06:46 +00:00