sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
54,857 Commits 2 Branches 0 Tags 753 MiB
006b550f6f
Commit Graph

1033 Commits

Author SHA1 Message Date
Campbell Barton
006b550f6f Fix the ABIFLAGS order for detecting Python debug builds 
D631 by mva
 2014-07-04 20:02:58 +10:00
Bastien Montagne
e81b938631 Fix scons unable to build with sources tar archive (no git repo available in this case). 
Reported by Clouclou over IRC, thanks!
 2014-07-02 20:30:50 +02:00
Bastien Montagne
f3f991c80f Install_deps: fix for clang url issue. 
Newest clang would use 'cfe-' prefix instead of 'clang-' one - don’t ask me why...
Had to make a wrapper around wget, that:
* Accepts an array of URLs as first parameter;
* Errors and exits when wget fails for some reason (was silent before).

Issue reported in T40871 by simonrepp (Simon Repp), thanks.
 2014-06-29 18:40:38 +02:00
Sergey Sharybin
72ac596e19 Update Ceres to latest upstream version 
Brings new bounds limiting and also prepares build system
for the changes in the upstream.

Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.

This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D581
 2014-06-27 14:08:27 +06:00
Sergey Sharybin
a5d5f7fe16 Another attempt to solve compilation error 
Sorry for the noise, but it's tricky to troubleshoot stuff
which only happens on buildbot..
 2014-06-26 16:22:04 +06:00
Sergey Sharybin
ee20433cf3 Tweak to previous commit, fixes scons to survive when upstream is not found 2014-06-26 16:18:38 +06:00
Sergey Sharybin
283abdf3b2 Fix compilation error with scons and older pythons 2014-06-26 16:03:52 +06:00
Thomas Dinges
11d1fea285 Windows: Enable numpy again, as we do have libs again for vc2013 and against py3.4. 2014-06-25 22:23:47 +02:00
Sergey Sharybin
9b987103f6 Use specified exception mask for buildinfo 
This way we only catch exceptions which we're intended to
and if something bad happens (like missing import due to
refactor or so) we'll see them instantly.
 2014-06-23 15:46:41 +06:00
Bastien Montagne
9b83ceb6f2 Fix scons building in case git is not available. 
Not so nice to use try/except here, but simplest solution to avoid failing in case
git commands fail for some reason...
 2014-06-20 18:13:20 +02:00
Campbell Barton
2dce13d213 Python: Remove deprecated uses of os.popen 
T40415 by Lawrence D'Oliveiro
 2014-06-20 02:00:46 +10:00
Howard Trickey
eaac6cbcd9 Add a bmesh_core_test, a start at testing bmesh functionality. 
Needed to make the blender link libraries a global property
now that tests are parallel to source directory.
Current sort order for blender link libraries doesn't work
for tests that start with few defined symbols. Doubling the
lib list works, but a TODO to find a better way (probably
using CMake's own mechanism for tracking dependencies).
 2014-06-19 11:53:55 -04:00
Sergey Sharybin
72b607ab74 Some WITH_TESTS weer not renamed to WITH_GTEST 2014-06-18 22:28:27 +06:00
Sergey Sharybin
306cbb82ec GTest unit testing framework 
Currently covers only small set of functionality.
 2014-06-19 02:09:16 +10:00
Sergey Sharybin
528673436b Disable cubins for OSX buildbot 
This is a temporary solution in order to get at least
rest of the blender begin up-to-date on the buildbot.

To be able to compile cubins again we need to switch
OSX builder machine to OSX 10.8 and CUDA toolkit 6,
which might take some time, unfortunately.
 2014-06-18 02:31:36 +06:00
Sergey Sharybin
38d6841687 Need to consider blender-v* a release branch, not just blender- 
This is because of blender-tiles branch we've got..
 2014-06-16 15:16:18 +06:00
Sergey Sharybin
0125ae1eb2 Forgot this in previous commit 2014-06-16 15:13:01 +06:00
Sergey Sharybin
be553273b8 Make blender-* branches not being displayed on the splash 2014-06-16 14:58:56 +06:00
Sergey Sharybin
db750b9843 Add missing dependency to CMake's msgfmt 
This could have lead to situation when CMake wouldn't re-generate
.mo file from changed .po file.
 2014-06-16 14:04:46 +06:00
Jens Verwiebe
c590b2a4b3 OSX: Set Blender.app and Blenderplayer.app creation and modification date to compiletime, else we would always have the time from checkout here 2014-06-02 14:20:07 +02:00
Sergey Sharybin
682b949d0f Sync changes with buildbot server 2014-06-01 18:31:48 +06:00
Martijn Berger
9907538239 msvc 2008 platofrm suffix changed to be -vc9 2014-05-24 11:20:18 +02:00
Martijn Berger
85398dea50 make MSVC plaformsuffix check much stricter. For some reason MSVC_VERSION is set 2014-05-19 19:21:25 +02:00
Martijn Berger
07e8096c63 Promote MSVC 2013 to be the official platform (without a numbered suffix) for scons 2014-05-18 15:36:46 +02:00
Campbell Barton
48a735d824 Update netbeans projectfile generator to v8 2014-05-18 15:55:00 +10:00
Thomas Dinges
2eeab8f191 Windows: Remove support for MSVC 2012 (VC11). 
The officially supported compiled is now MSVC 2013, and MSVC 2008 will be faded out slowly over the coming weeks.
 2014-05-15 07:50:02 +02:00
Campbell Barton
ccbac7862f CMake: use project name when generating project files 2014-05-11 16:21:38 +10:00
Campbell Barton
ba88824f32 Remove unused scons config files 2014-05-08 14:16:26 +10:00
Campbell Barton
60c5887fe8 CMake: mark vars as advanced 2014-05-06 06:04:29 +10:00
Bastien Montagne
f5687323a3 Install_deps: explicitely disable OSL/LLVM seems needed... 2014-05-05 20:57:52 +02:00
Bastien Montagne
f7aac45488 Fix T40025: install_deps.sh generating wrong make flag for OSL 
Most cases should be handled OK now (not all though, would make script way too much tricky -
bash is a hell of a messy language :/).
 2014-05-04 21:34:19 +02:00
Bastien Montagne
a4408f405d install_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might help in some cases... 2014-05-03 12:46:12 +02:00
Bastien Montagne
1e9c4639c2 Install_deps.sh: do not use terminfo in our own llvm build. 
llvm-config does not report it as link arg as it should
(see http://stackoverflow.com/questions/21477407/llvm-3-5-fails-to-link).
 2014-05-01 16:25:39 +02:00
Bastien Montagne
9fb4c487ed Fix T39938: install_deps.sh fails when compiling OSL 
Should always use a fixed rev in git repos!

Also done some other cleanup/fixes.
 2014-05-01 09:30:11 +02:00
Thomas Dinges
d1009bdad5 Windows: Disable Numpy for now, we miss the libs for Python 3.4. 
Also make the flag WITH_BF_PYTHON_INSTALL_NUMPY flag actually work on Windows.
 2014-04-30 16:49:49 +02:00
Brecht Van Lommel
741f17f05b Cycles CUDA: make CUDA toolkit 6.0 the official supported version. 
This also updates the configurations to build kernels for compute capability
5.0 cards, when using and older CUDA toolkit version this will be skipped.

Also includes tweaks to improve performance with this version:
* Increase max registers on sm_30, sm_35 and sm_50
* No longer use texture storage on sm_30
 2014-04-30 16:07:27 +02:00
Campbell Barton
b96d531bc9 Python: move to version 3.4x on all platforms 2014-04-30 23:19:16 +10:00
Campbell Barton
417efb0e8b Remove hard coded Python version for scons 
note: this isn't best way of extracting version without '.'
 2014-04-30 22:29:28 +10:00
Bastien Montagne
60b015d1fc Update ffmpeg in install_deps.sh to 2.1.4. 2014-04-23 14:17:39 +02:00
Bastien Montagne
db8e7d7a88 install_deps: update to py3.4 and numpy1.8. 2014-04-22 10:08:39 +02:00
Sergey Sharybin
41b37c007c Corrected the comment 2014-04-22 13:02:39 +06:00
Sergey Sharybin
830a8847bd Switch buildbot to Python-3.4.0 2014-04-22 13:00:35 +06:00
Campbell Barton
36defb7e66 Disable quicktime when in cmake's lite configuration 2014-04-18 23:22:09 +10:00
Jens Verwiebe
cddbe87ae5 OSX/python: update to py 3.4 2014-04-15 14:12:22 +02:00
Antony Riakiotakis
3ab0a4da73 Enable openmp in MinGW-w64 2014-04-07 19:01:19 +03:00
Bastien Montagne
959ec27ac9 Install_deps.sh: tweaks to support new LLVM-3.4. 
Issue is, looks like Debian testing's graphic backend now uses LLVM-3.4,
which conflicts with 3.3 in Blender and makes it crash.

So add support to handle 3.4, by both allowing to force a specific version for some libs,
and switching back to head of official repo for OSL.
 2014-04-06 17:50:50 +02:00
Bastien Montagne
cfbfb5e626 Great, now Debian Jessie as well can cause libyaml-cpp version mismatch... Update warning message! 2014-04-04 22:45:23 +02:00
Bastien Montagne
6ff0fcdae7 Some stupid systems give limited powers to sudo... So add a --no-sudo option disabling usage of sudo! 
Note in this case, script becomes more or less useless, just spit out names of packages to install...

Requested by Dalai Felinto over IRC.
 2014-04-04 22:38:49 +02:00
Jens Verwiebe
8ff74bed9b Scons/cycles: fix header distribution for geom 2014-04-04 13:07:32 +02:00
Antony Riakiotakis
cc439f683b fix scons ffmpeg libraries for mingw32 2014-03-30 01:35:39 +02:00