sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
50,031 Commits 2 Branches 0 Tags 753 MiB
01747a9cf0
Commit Graph

852 Commits

Author SHA1 Message Date
Bastien Montagne
01747a9cf0 Add --required-numpy to force compilation of both py3.3 and numpy1.7 in case you really need numpy and 1.7 is not available! 2013-09-16 15:22:10 +00:00
Daniel Salazar
0732375d35 Making install_deps.sh correctly see hyperthreading 2013-09-16 14:38:33 +00:00
Bastien Montagne
fa1683e713 Install_deps.sh updates: 
* Raise OpenCOLLADA version to 18da7f4109a8eafaa290a33f5550501cc4c8bae8 as requested by Gaia.
* Made OSL build/install ON by default (no more an experimental feature!).
* Use default LLVM version under Debian (specifying a version does not work with OSL when you have more that one installed :( ).
 2013-09-16 13:02:49 +00:00
Jens Verwiebe
13263541ec OSX/scons: take xcode-select path into account, to work well with different xcode versions 2013-09-13 15:41:18 +00:00
Jens Verwiebe
97e823488c OSX/Scons/clang: restrict the ftemplate fix to clang only 2013-09-10 12:31:21 +00:00
Jens Verwiebe
d638c4c064 OSX/Scons/clang: compilefix for libmv, as discussed with brech just globally 2013-09-09 17:26:09 +00:00
Campbell Barton
648f2102d8 update bmesh doxy docs, remove double-promotion warnings in remove-strict-flags cmake macro. 2013-09-08 06:55:58 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
6d87f2749d remove freebsd7 config. its fairly old and not maintained. 2013-09-04 23:44:41 +00:00
Campbell Barton
90b9fa3608 fix [#36459] Official blenderplayer can not go fullscreen on Linux 
use modified patch from Alex Fraser (z0r)
 2013-09-04 23:43:25 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly. 
added to cycles standalone too.
 2013-08-30 20:26:57 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Brecht Van Lommel
11cfc97e29 Fix cmake Inkscape auto generate of SVG on OS X giving an error popup, the binary 
that is found by find_program is a shim that doesn't take command line arguments.
 2013-08-26 14:13:04 +00:00
Bastien Montagne
e61c3beb48 Remove (comment out) auto-generating png form svg (r59382) in CMake, handy but gives nasty "false changes" in svn. Let's try not to forget to update PNGs when needed, then! 2013-08-26 12:16:23 +00:00
Bastien Montagne
29c8d3e20d Automatically re-generate png icon files from svg ones (CMake only for now)... Expects Inkscape program. 2013-08-22 13:51:00 +00:00
Bastien Montagne
4c38db307e Fix [#36534] Errors in install_deps.sh script when running on Arch Linux 
Patch provided by Darren Beck, thanks!
 2013-08-22 06:05:40 +00:00
Sergey Sharybin
db01d290e7 Compilation error fix when using scons 
OpenEXR libraries shall go after OpenImageIO,
otherwise it'll fail to find symbols needed
for OIIO.
 2013-08-15 12:05:42 +00:00
Campbell Barton
a62163ada3 remove unused auto-key struct-member from uiAfterFunc, add compiler defines to cppcheck utility script. 2013-08-10 23:27:42 +00:00
Bastien Montagne
65b4f41342 Linux install_deps: update OpenCOLLADA to 828b60384552b83e55d2af7055f07d2c40b4d3f4 repo UID. 2013-08-10 11:06:46 +00:00
Campbell Barton
7cb1415530 pass compiler defines such as __FLT_MIN__ to smatch and sparse (they fail without them). 2013-08-08 01:53:02 +00:00
Campbell Barton
02ba328ca8 clang/cmake - quiet warnings for external libs and reference moto as a system include. 2013-07-15 08:26:16 +00:00
Campbell Barton
6ebfdd8dc3 remove reference to wrong python version in comments & pedantic style edit. 2013-07-10 09:40:49 +00:00
Bastien Montagne
2c506fd70c Patch [#35897] install_deps: add OpenEXR to ldconfig by Gavin Howard, thanks. 2013-06-30 16:20:59 +00:00
Bastien Montagne
ba2ee5f5f3 Update osl magic number when updating version ;) 2013-06-26 12:37:48 +00:00
Thomas Dinges
d5fd3b3688 Install Deps script: 
* Use recent OSL 1.3.2 release.
 2013-06-26 11:30:37 +00:00
Campbell Barton
a5b78bb6bd replace use of 'a.find(b) != -1' --> 'b in a' 2013-06-24 05:55:05 +00:00
Jürgen Herrmann
86bebb3380 Fix for #35851: 
- Make scons work for non western CL.exe.
 2013-06-24 05:45:03 +00:00
Jürgen Herrmann
d7b99389ba prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas crashes. 
Workaround to keep buildbot running.
I filed a bug report to NVidia, will remove this as soon as the problem is fixed.
 2013-06-23 19:07:46 +00:00
Sergey Sharybin
4acd963860 Switch buildbot to use OpenEXR-2.0 2013-06-23 11:31:54 +00:00
Brecht Van Lommel
2df82a2a2b Code cleanup: fix some vs2012 compiler warnings 2013-06-21 12:33:19 +00:00
Daniel Salazar
b2e01fa6bb Updating suse packman repo url, name and alias to go in line with what suse does right now. At least this should avoid duplicate packman repos on 12.3 2013-06-20 21:36:30 +00:00
Bastien Montagne
6a269e2a8e Install_deps.sh: ask suse users whether they want to install packman or not (can be already installed/enabled from a different URL, Suse repositories management is to complex to be handled automatically at this point). 2013-06-20 19:19:11 +00:00
Nathan Letwory
2749875945 Move DLL copying to before actual build process. 2013-06-20 14:19:46 +00:00
Brecht Van Lommel
8d6e5e2fee Cycles: update build configurations to include CUDA sm_35 architecture. When using 
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
 2013-06-20 13:10:47 +00:00
Jürgen Herrmann
eae9519f9d VS 2012 x86 SCons update. 2013-06-18 20:11:58 +00:00
Jürgen Herrmann
836b91c9c7 Scons and BuildBot changes for MSVC 2012 support. 
Thanks Brecht and Thomas for reviewing ;)
 2013-06-18 11:55:32 +00:00
Campbell Barton
970e9123b4 cmake: remove set_lib_path macro 2013-06-17 18:15:56 +00:00
Thomas Dinges
91d7df12ee CMake / vc2010: 
* Remove vc2010 support from cmake. 

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
 2013-06-17 18:00:38 +00:00
Nathan Letwory
9dd639f169 Only printing errors. 
(No news is good news).
 2013-06-16 20:36:34 +00:00
Bastien Montagne
8e5cd99e0b Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR). 
As OSL headers mix #include <OpenEXR/foo.h> and #include <foo.h>, we need both /path/to/openexr/include and /path/to/openexr/include/OpenEXR include paths... :/

Issue investigated by doug65536 on IRC, thanks.
 2013-06-16 18:59:50 +00:00
Nathan Letwory
fc4f6a7bad Set up OurSpawn for MinGW compile environment on Windows. 2013-06-15 21:20:06 +00:00
Brecht Van Lommel
344ffb99ae Buildbot: use relative path for redistributable dlls on windows. 2013-06-15 14:01:12 +00:00
Brecht Van Lommel
790e8b6eda Buildbot: use 1 thread for windows builds. 2013-06-15 10:16:01 +00:00
Bastien Montagne
0794c2722d Add USE_PYTHON=OFF and USE_OCIO=OFF to OIIO compilation (we do not need either of those). 2013-06-15 08:56:04 +00:00
Campbell Barton
412c043474 Python script auto-execution changes: 
- script execution is off by default

- if a blend file attempts to execute a script
  this shows a message in the header with the action
  that was suppressed (script/driver/game-autostart) and 2 buttons to either reload the file trusted, or to ignore the message.

- the file selector will always default to use the trust setting in the user preferences,
  but reloading an open file will keep using the current setting (whatever was set before or set on the command-line).

- added SCons setting WITH_BF_PYTHON_SECURITY, this sets the default state for the user prefereces not to trust blend files on load.
  ... this option was in CMake before, but always off, now its enabled by default for SCons and CMake, and forced on in CMake for now.
 2013-06-10 00:42:16 +00:00
Antony Riakiotakis
29871b29b5 Fix compilation on MinGW32 scons. The compiled library there is already static, revert renaming of linked library 2013-06-03 06:40:25 +00:00
Sergey Sharybin
732c566f2f Fix #35587: Cycles: image movie to single image crashing 
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.

Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.

And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.

Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.

Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.

Further tweaks for mingw and msvc2012 could be needed tho.
 2013-06-02 15:02:17 +00:00
Sergey Sharybin
b453516cf2 Updtae buildbot's master.vfg 2013-06-01 10:18:47 +00:00
Bastien Montagne
686e6acf5d Stupid typo, reported by Eugenio Pignataro on ML, thx. 2013-05-31 17:39:43 +00:00
Bastien Montagne
d4480a0fd8 Various fixes for install_deps' scons options. 
Also svn-ignore BUILD_NOTES.txt generated file.
 2013-05-29 18:57:36 +00:00