kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
29,041 Commits 2 Branches 0 Tags 753 MiB
1216fe7f21
Commit Graph

159 Commits

Author SHA1 Message Date
Joseph Eagar
f01261d040 merge with/from trunk at r35190 2011-02-27 06:19:40 +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
Joseph Eagar
82432d0d99 merge from trunk at r31523 2010-09-07 05:47:34 +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
Joseph Eagar
c11c196efa part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :) 2010-07-19 04:44:37 +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
Joseph Eagar
71003b9bcc merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge 2010-03-09 04:32:40 +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
Joseph Eagar
8f788c64db merge with trunk/2.5 at r23876 
[[Split portion of a mixed commit.]]
 2009-10-22 23:22:05 +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
Joseph Eagar
deebf4f8f0 merge with 2.5/trunk at r23271 2009-09-16 17:43:09 +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
Joseph Eagar
de7f08cc41 merge with 2.5 at r22793 2009-08-26 10:27:04 +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
Joseph Eagar
38de6d14e4 merge with 2.5 (not trunk, last merge message said that on accident) at r22252 2009-08-06 09:56:14 +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
Joseph Eagar
69327f2ebd merge with trunk at r21785, and also fixed stupid ngon normals bug 2009-07-22 02:57: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
Joseph Eagar
f026266e18 merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that. 
[[Split portion of a mixed commit.]]
 2009-05-23 03:24:15 +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
Joseph Eagar
084aa7aedb merge with 2.5 at r19462 2009-03-30 10:03:03 +00:00
Chris Want
77e0199dc3 Makefile updates for Blender 2.5 (from GSR) 2009-03-19 01:50:45 +00:00
Joseph Eagar
aeab4485a9 fixed duplicated header that had gotten out of sync with it's duplicated sibling. man that was annoying. would get rid of duplicated header, only I really should do that in main 2.5 branch, which i don't have checked out right now. 2009-03-01 08:22:46 +00:00
Joseph Eagar
34dcf5fca2 adding files from merge. 2009-03-01 06:47:11 +00:00
Ton Roosendaal
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
Brecht Van Lommel
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
Brecht Van Lommel
ec00764dd2 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17434:HEAD 2008-12-14 17:32:24 +00:00
Stefan Gartner
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
Campbell Barton
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
Benoit Bolsee
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
Benoit Bolsee
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
Daniel Genrich
44c01e2621 Bugfix for [#17333] Fluid bake memory issues provided by Andre Pinto 2008-10-09 12:19:16 +00:00