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
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
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
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
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
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
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
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
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
Chris Want
77e0199dc3
Makefile updates for Blender 2.5 (from GSR)
2009-03-19 01:50:45 +00:00
7f780bffd6
2.5
...
Made API for elbeem sane; it was prototyping and exporting
functions from old src/ !
Note; elbeem.h is not exported anymore.
2009-01-24 13:47:20 +00:00
9bcdb4b758
2.5: various warning fixes.
2009-01-17 00:51:42 +00:00
Nathan Letwory
93d9e7749d
2.5 / SCons
...
I did a very drastic cleanup for the different libgroups, there's now only a few left. It compiled with scons/msvc, will be testing in a bit on linux, too.
If you get any problems, please reply to this commit message on the taskforce ML.
2008-12-23 16:07:24 +00:00
ec00764dd2
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD
2008-12-14 17:32:24 +00:00
f1474648d3
patch #8583 : Add support for gcc on irix
...
to compile blender with gcc on IRIX, IRIX_USE_GCC needs to be set to true in
user-def.mk.
Other changes related to irix:
* compile solid from extern/
* don't build plugins (yet) with "make release" when using gcc (the shell
script used assumes MIPSpro is installed)
* use statvfs instead of statfs on irix, like done on solaris
* use external libs from $(LCGDIR) instead of /usr/freeware
* use glew header files from $(LCGDIR)/glew instead of the ones installed on
the system (this applies to other platforms as well)
* ffmpeg support currently is disabled on irix
2008-11-24 14:15:05 +00:00
483136c8e4
Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.
...
writefile.c had usless include.
2008-11-11 14:14:22 +00:00
61a83d2fba
Add MSVC90 project files - part 3. Extern and Intern projects are merged in projectfiles_vc9\blender\blender.sln solution, you just need to open that solution to compile everything with VS2008.
2008-11-10 21:22:22 +00:00
8eec6cecc0
Add MSVC90 project files - part 1.
2008-11-10 15:36:58 +00:00
Nathan Letwory
2ecf987dc6
* Minor cleanup of SCons files
...
- cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1
- changed SConscripts accordingly
2008-10-22 11:28:10 +00:00
44c01e2621
Bugfix for [ #17333 ] Fluid bake memory issues provided by Andre Pinto
2008-10-09 12:19:16 +00:00
64527fa81d
patch [ #17772 ] Fluid solver not built with OpenMP in Makefile build system
...
Submitted By: gsr
Kent
2008-10-06 19:57:42 +00:00
0eaccf881b
Solaris was having problems with sqrtf and friends again.
...
I changed sqrtf to sqrt in elbeem
in bullet2 I added defines found in floatpatch.h eventually
we should make a "floatpatch.h" that all of blender can use.
Kent
2008-10-03 13:16:10 +00:00
45035f10ec
[ #17703 ] Segfault on fluid activation.
2008-09-29 14:44:12 +00:00
7c94eed4cb
Fixing compile warnings
2008-09-24 00:23:01 +00:00
558d7499a6
Patch #17666 by Vladimi<C2>r Marek
...
Fixes for solaris compiling
2008-09-22 15:59:04 +00:00
6e3bdacc11
Fixing missing function in elbeem
2008-09-22 10:58:50 +00:00
80f4b5b94f
Removing control define
2008-09-22 10:21:57 +00:00
6e29313ac3
Update MSVC project files
2008-09-21 21:41:27 +00:00
7afc0ca600
Two compile fixes for msvc and cmake provided by broken
2008-09-04 10:29:41 +00:00
a9ffeb8cad
Fixing debug output
2008-09-03 16:02:40 +00:00
c587252a78
Bugfix for sphere-in-control-object (reported by broken)
2008-09-03 16:01:25 +00:00
5a310fe8e1
Bugfix for non-compiling on msvc and mingw (reported by Matt)
2008-08-12 09:36:51 +00:00
8b77b54469
WIP commit, completely untested (should introduce: 1. copy of modifier settings work, 2. reverse domain, 3. reverse control)
2008-07-28 16:55:48 +00:00
d7fecc9e96
Fluid control: WIP commit before weekend, not working is crashing on the first 3 frames
2008-07-25 18:57:16 +00:00
9bf0bfcae7
Fix for crash with fc and quality < 5 (reported by Nudel)
2008-07-21 13:47:42 +00:00
037f1188e6
svn merge -r 15529:15649 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-07-20 08:52:48 +00:00
d50d175ba1
Win64 fix: disable 1GB restriction for 64bit windows systems, baking fluid with >4GB is verified to work on Vista64.
2008-07-14 12:24:49 +00:00
b369936b11
Fix for several memory leaks in fluidsim (found with Valgrind).
2008-07-11 18:08:25 +00:00
3bab1eba3a
Introduced quality to GUI, not yet tested (WIP commit)
2008-07-08 17:38:33 +00:00
2ad696111e
Some channel fixes for fc
2008-07-07 20:28:56 +00:00
e409c2463d
WIP commit to introduce channels
2008-07-07 14:36:33 +00:00
d3745d70a5
Another addition of time values, yet some things to follow
2008-07-07 09:23:12 +00:00
7bbf88d602
Added 4 gui elements to structs, another 2-3 will follow; Unsolved problems: simulation and control time desync
2008-07-06 21:55:03 +00:00
b3303c98b1
Another fluid type 'control' added and introduced to elbeem, still some issues to solve but with 1 change in fluidsim.c it kind of works already (hint for me - disabled for other people so they don't complain)
2008-07-06 18:19:42 +00:00
baa1001b47
Initial GUI implementation, yet not functional
2008-07-04 15:23:21 +00:00
c9c3c41815
svn merge -r 14236:14505 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-04-21 21:30:50 +00:00
b43f24a944
Reverting new epsilons since they had bad global impact - instead just remove the problematic normalize() call
2008-04-20 09:57:28 +00:00
4147a5a33d
Fluid: got to the real problem of the issue --> wrong float epsilon resulted in normalizing a vector to fail, reverted other change from today
2008-04-18 18:25:11 +00:00
2318e47ae9
Fluid bugfix [ #8395 ] [ #6200 ]: this should solve the popping/inconsistency/flickering issue with fluids, please give feedback :)
2008-04-18 14:12:42 +00:00
