griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
35,188 Commits 1 Branch 0 Tags
444833a8fbecde23ccc6a1a78be7a97f052d2cfd
Commit Graph

533 Commits

Author SHA1 Message Date
Campbell Barton
efb4eff353 svn merge ^/trunk/blender -r42722:42742 2011-12-20 01:33:14 +00:00
Thomas Dinges
b66c87231a * Changes for static win32 png libs. 2011-12-19 19:46:07 +00:00
Thomas Dinges
0ebb1a3f9f * Fix for moving mingw png libs. 2011-12-19 14:46:17 +00:00
Campbell Barton
2457d4f5ab svn merge ^/trunk/blender -r42680:42722 2011-12-19 10:40:48 +00:00
Thomas Dinges
8f0e9c7c09 MinGW png libs 
* Moved to gcc/png in the libs dir.
 2011-12-18 23:23:09 +00:00
Campbell Barton
a3bdb2d825 svn merge ^/trunk/blender -r42586:42617 2011-12-14 00:30:31 +00:00
Sergey Sharybin
5e586fa0ca Buildbot tweaks: 
- Enable SSE/SSe2 for 64bit builds
- Build CUDA binaries
 2011-12-13 09:54:48 +00:00
Campbell Barton
8d0dc29aba remove BLI_blenlib since its not needed in quite a few bmesh files 2011-12-12 22:34:05 +00:00
Jens Verwiebe
94bc2b0cff OSX: proper scons config and linking weak for jackOSX and errorhandling 2011-12-12 22:17:02 +00:00
Campbell Barton
99d893bb89 svn merge ^/trunk/blender -r42516:42521 2011-12-09 00:23:57 +00:00
Thomas Dinges
7c630aac80 Scons/CUDA 
* Added missing bitness info to the nvcc_flags. 
This makes sure that the nvcc compiler builds the correct cubins.
 2011-12-08 19:16:43 +00:00
Campbell Barton
35e80c5544 svn merge ^/trunk/blender -r42439:42466 2011-12-06 18:50:45 +00:00
Thomas Dinges
b7649ea757 Cycles / CUDA Kernel compile: 
* Added option "WITH_BF_CYCLES_CUDA_THREADED_COMPILE" for the people who have much RAM (8 or more) and can compile several kernels at the same time. If enabled, it uses the general BF_NUMJOBS flag.
* The option is off per default.
 2011-12-06 16:00:57 +00:00
Campbell Barton
4b73f587ee attempt to fix defione for qtcreator project file and cycles define. 2011-12-06 04:53:16 +00:00
Campbell Barton
22a1ad61f9 svn merge ^/trunk/blender -r42372:42416 2011-12-04 18:39:19 +00:00
Thomas Dinges
12326ac6c5 CUDA 
* Added CUDA Binaries to Windows scons config files, disabled by default. 
Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably.
 2011-12-04 10:45:25 +00:00
Campbell Barton
15ad39e684 svn merge ^/trunk/blender -r42303:42329 2011-12-02 01:01:07 +00:00
Brecht Van Lommel
45de380771 Cycles 
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
  more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
 2011-12-01 16:33:21 +00:00
Campbell Barton
3bccd1ffed svn merge ^/trunk/blender -r42182:42194 2011-11-27 21:18:59 +00:00
Sergey Sharybin
020bafb0af Buildbot configuration tweaks 
- Force libsamplerate linking statically
- Remove global compiler flags for sse2 and sse.
  Tests of release builds didn't show big difference in time of
  tracking using SAD algorithm or time of solving,
  so this shouldn't introduce big slowdown.
 2011-11-27 19:21:49 +00:00
Campbell Barton
4b3976cc5a svn merge ^/trunk/blender -r42116:42139 2011-11-24 20:01:45 +00:00
Campbell Barton
6e28ac2d7b pep8 edits and avoid naming conflicts with python builtins 2011-11-24 19:36:12 +00:00
Thomas Dinges
366554d303 Scons / Cycles: 
* Add dummy WITH_BF_CYCLES_BINARIES to scons, to be able to copy the .cubin kernels from cmake and have it work.
 2011-11-24 19:22:34 +00:00
Campbell Barton
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
Campbell Barton
df22957bfc image format arg parsing for creator.c 
move these checks from creator into BKE's image.c, this way we dont need the defines for creator, scons was missing DDS, HDR & Cineon  for example and nobody noticed.
 2011-11-24 05:18:26 +00:00
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
Campbell Barton
d9e99abe37 hide overly picky warnings from 'pylint' for pep8 script, indentation edits. 2011-11-19 16:17:35 +00:00
Campbell Barton
6585527151 add python3 checks to avoid confusion from errors with python2. 2011-11-19 00:01:10 +00:00
Campbell Barton
e1250f2168 svn merge ^/trunk/blender -r41954:41961 2011-11-18 09:34:45 +00:00
Campbell Barton
c63873ad22 exclude addons_contrib for release builds for scons/osx too 2011-11-18 05:14:13 +00:00
Campbell Barton
5600d214f1 svn merge ^/trunk/blender -r41939:41954 2011-11-18 05:06:53 +00:00
Campbell Barton
8c6057d5e3 exclude addons_contrib/ for release builds. 2011-11-17 19:43:59 +00:00
Campbell Barton
dfeda8688e svn merge ^/trunk/blender -r41932:41939 2011-11-17 05:33:02 +00:00
Campbell Barton
1cfbde0eb4 pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases. 
This should fix an error with generated qtcreator projects.

also replace decoded bytes for unicode escape sequences in the VIEW3D_MT_edit_text_chars menu.
 2011-11-17 04:05:54 +00:00
Campbell Barton
9d05ccf9e8 svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined 2011-11-16 19:06:38 +00:00
Campbell Barton
4d9766aacf minor cleanup 
- remove / comment unused python vars
- replace mul_v3_fl(somevec, -1.0f); with negate_v3(somevec);
 2011-11-16 16:38:37 +00:00
Campbell Barton
9d31c99c26 support for creating project files in utf8 paths (was defaulting to ascii and throwing errors) 2011-11-16 03:44:08 +00:00
Campbell Barton
c00c0134e0 svn merge -r41847:41899 ^/trunk/blender 2011-11-16 03:10:15 +00:00
Sergey Sharybin
df6aa48eb9 Fixed typo in previous commit 2011-11-15 09:21:22 +00:00
Sergey Sharybin
5cf345f860 Request from nico_ga: expose WITH_BF_STATIC* variables to linux-config so 
builders can easily find interesting for them flag.
 2011-11-15 08:43:23 +00:00
Campbell Barton
e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender 2011-11-15 02:58:06 +00:00
Campbell Barton
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
Joshua Leung
36c073ab2a mingw compiles again after OceanSim stuff 2011-11-14 10:35:11 +00:00
Sergey Sharybin
6c3e4b77bf Fix #29245: BuilderBot can't build anymore 
Buildbot is using different settings for blender and player,
enable fftw library in rules for player now.
 2011-11-14 05:52:06 +00:00
Jens Verwiebe
ea38cb2e5e Scons_buildsystem: add WITH_BF_OCEANSIM = True to all configs 2011-11-13 15:10:54 +00:00
Campbell Barton
7d0b5920c6 rename cmake WITH_OCEANSIM --> WITH_MOD_OCEANSIM and tag CYCLES_CUDA_BINARIES_ARCH as advanced. 2011-11-13 14:16:43 +00:00
Lukas Toenne
11c83d8432 Ocean Sim modifier patch 
by Matt Ebb, Hamed Zaghaghi

This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]

The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.

[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean

[2]
http://www.savetheoceansim.com

[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
 2011-11-13 12:17:27 +00:00
Brecht Van Lommel
0f85990d4a Cycles: more linux build system tweaks, attempting to avoid using boost 
system libraries by default if we have a lib/ directory.
 2011-11-11 20:57:00 +00:00
Brecht Van Lommel
38fd8c0e22 Cycles: fix wrong openimageio path for lib/ directory. 2011-11-11 19:20:52 +00:00
Brecht Van Lommel
a7f09ea0b2 CMake/Scons: automatically use ffmpeg, boost and openimageio from the svn lib/ 
directory if available, which should make building with ffmpeg and cycles easier.

If this folder is not available or another path is specified in user-config.py
or CMakeCache.txt, this should have no effect. Wiki build instructions now show
how to use these.
http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux
 2011-11-11 14:52:24 +00:00