sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
50,909 Commits 2 Branches 0 Tags 753 MiB
4c42e73a9d
Commit Graph

183 Commits

Author SHA1 Message Date
Brecht Van Lommel
7c29744111 Fix build error when building without OpenMP. 2013-09-27 19:44:06 +00:00
Sergey Sharybin
dad37860e2 Elbeem: fix memory leak and add guarded allocator directives 2013-09-27 18:55:26 +00:00
Sergey Sharybin
16da43ef19 Elbeem: Use pragma directive instead of overriding number of omp threads 
Global OpenMP threads override is not a good idea because this would affect
all possible OpenMP blocks running at the same time as simulation.

And that was actually a big on restoring number of threads: code needed to
store current number of threads, not maximal one.
 2013-09-27 18:55:15 +00:00
Campbell Barton
8f1e51a7d9 remove WINDOWS checks in cmake, this variable isn't defined on windows and checks weren't needed. 
also remove redundant dot_v3v3 in shrinkwrap constraint.
 2013-09-03 03:04:44 +00:00
Campbell Barton
ece766ee7e code cleanup: unused defines, remove unused scanfill success value from BLI_scanfill_begin(). 2013-04-10 23:52:07 +00:00
Jens Verwiebe
b9b23d697b Fluid threads: re-add an erratically forgotten line, fix typo, set default threadcount to logical threadcount of machine 2013-04-10 23:19:57 +00:00
Jens Verwiebe
5ac66ee378 Fluid threads: add a restore to former omp threadcount when baking is done, todo: default should be logical corecount 2013-04-10 23:10:25 +00:00
Jens Verwiebe
842d0a4258 The fluid threads setting is still WIP, for now fix compiling without openMP enabled 2013-04-10 20:05:11 +00:00
Jens Verwiebe
cbe9ae244e Add a gui control for setting omp threads in fluids 2013-04-10 18:35:18 +00:00
Daniel Genrich
68ac08681a Elbeem fluid: Remove hardcoded 16GB RAM limit on 64bit systems 2013-03-30 20:50:28 +00:00
Daniel Genrich
2cd0f0d2fe Bugfix [#34749] Fluid domain > 10GB crashes Blender - out of memory 
I am unsure if I did catch all problematic code but I ran out of memorybefore the sim started ;)
 2013-03-25 11:11:49 +00:00
Brecht Van Lommel
4f3ca854e1 Fix various warnings with clang build, and adjust cmake clang warnings flags 
to include a few more that gcc is using too.
 2013-02-26 21:58:06 +00:00
Bastien Montagne
ab2c273b12 Added GPL header to sconscripts! 
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
 2012-12-17 08:01:43 +00:00
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