Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-05Remove SVN referencesCampbell Barton
2014-08-05SpellingCampbell Barton
2014-08-05Fix to commit rB77b7e1fe9ab: need ${target} instead of blender in cmake macro.Howard Trickey
2014-08-05Deduplicate CUDA and OpenCL wranglersSergey Sharybin
For now it was mainly about OpenCL wrangler being duplicated between Cycles and Compositor, but with OpenSubdiv work those wranglers were gonna to be duplicated just once again. This commit makes it so Cycles and Compositor uses wranglers from this repositories: - https://github.com/CudaWrangler/cuew - https://github.com/OpenCLWrangler/clew This repositories are based on the wranglers we used before and they'll be likely continued maintaining by us plus some more players in the market. Pretty much straightforward change with some tricks in the CMake/SCons to make this libs being passed to the linker after all other libraries in order to make OpenSubdiv linked against those wranglers in the future. For those who're worrying about Cycles being less standalone, it's not truth, it's rather more flexible now and in the future different wranglers might be used in Cycles. For now it'll just mean those libs would need to be put into Cycles repository together with some other libs from Blender such as mikkspace. This is mainly platform maintenance commit, should not be any changes to the user space. Reviewers: juicyfruit, dingto, campbellbarton Reviewed By: juicyfruit, dingto, campbellbarton Differential Revision: https://developer.blender.org/D707
2014-08-02fix check for not llvmMartijn Berger
2014-08-02Collada and llvm both use the same functions and they clash.Martijn Berger
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work around it.
2014-08-02CMake: add headerCampbell Barton
2014-08-02Move to OIIO 1.4 also for windows x86Martijn Berger
2014-08-01Make build work with llvm3.4 and oiio 1.4Martijn Berger
2014-08-01OSX/scons: Change Blender bundle datastructures + referennces to match the ↵Jens Verwiebe
upcoming codesigning needs - i used deprecated rules up to now which will break in OSX > 10.9.5 and 10.10 > dp4 - todo: adapt cmake due it will break with this commit
2014-07-29OSX/buildbot: after recent scons fix, UTF lib linkage is handled dependent ↵Jens Verwiebe
on config, so remove now obsolete lines
2014-07-28Install_deps: Raise openexr/ilmbase magic numbers, looks to be needed...Bastien Montagne
Btw, if someone can explain me why OPENEXR_FORCE_REBUILD does not work like all other force options... :/
2014-07-28OSX/buildbot: Fix 32bit compile by removing OSL/LLVM and add back UTF to ↵Jens Verwiebe
Collada - due OSL i386 never worked on OSX, the new libs do not even contain this arch ! - As we had to fix duplicated symbols from generic UTF finctions same in LLVM and COLLADA, LLVM-less build must have UTF lib reenabled
2014-07-28CMake: add glew-mx libraryCampbell Barton
2014-07-28CMake: use our template for finding the glew libraryCampbell Barton
2014-07-28Switch buildbot to new llvm/oiio/oslSergey Sharybin
2014-07-28Make requests python package to be detected in the same way as numpySergey Sharybin
This solves missing requests package reported on the systems where it's located in dist-packages rather than in site-packages. To do this there's now a helper macros which handles both requests and numpy now and could be used for more packages in the future. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D686
2014-07-27Install_deps: forgot to cleanup that in latest commits.Bastien Montagne
2014-07-25Install_deps: Force to always compile OCIO for now.Bastien Montagne
This is a much simpler fix to that libyaml-cpp mess, since doing it that way we get our static own libyaml-cpp... And this should work for all platforms (realized libymal-cpp-ver option was only implemented for deb-like distro, since it was the first place where issue showed up :/ ).
2014-07-25Install_deps: Update OSL to 1.5.10, llvm to 3.4 and oiio to 1.4.11.Bastien Montagne
Note: had to swicth back to own repo for osl as well, ILM guys seem unable to handle CMake build system properly!
2014-07-25OSX: adaptions needed for renewed osl/oiio/llvmJens Verwiebe
2014-07-24Buildbot: Never write 'master' branch in packed file names.Bastien Montagne
2014-07-24Buildbot: proper fix for 'testbuild overriding master builds' issue.Bastien Montagne
2014-07-24Revert "Buildbot: more fixes, this time to upload logic."Bastien Montagne
This reverts commit b1e1646d945d8f7e15c7828a9a5fb0fc4f516f51. Sorry, was a bit too quick on this one... :/
2014-07-24Buildbot: more fixes, this time to upload logic.Bastien Montagne
We do not want testbuild to override 'official' (master) builds!
2014-07-23Buildbot: fix to previous commit, to handle svn libs...Bastien Montagne
2014-07-23Buildbot: rework to support branch selection.Bastien Montagne
Issue with previous code was that branch selected was applied to all repositories. To be able to control branch on a per-repo basis, we need to use codebases instead. This commit only enables branch (master/testbuild) and revision selection for master, we probably do not need this for submodules currently (easy to enable anyway). Note: tested on local buildbot setup, for linux only (up to build step, have no build env).
2014-07-23Occlusion Query based selection.Antony Riakiotakis
This patch creates an interface for selection mechanisms in opengl. This makes it possible to switch between occlusion query based or select rendermode based selection transparently. This is really useful on graphics drivers that do not accelerate the select rendermode path (some ATI cards are notorious for this, and the new path is used by default there), since occlusion queries are always hardware accelerated due to their use in games. The option can be found under system - selection. Auto just enables occlusion queries for ATI users while the rest of the options enforce one of the two methods always. There is just one known change, previous code enforced nearest bone to always get selected, even when mouse selecting near the same position, I couldn't replicate the behaviour though. patch by me with edits and review by Campbell. Thanks!
2014-07-22Buildbot: fix submodule branch issue (we have to fix it on 'master', since ↵Bastien Montagne
default one can be overriden by custom setting for force scheduler).
2014-07-22Update buildbot conf, to enable a 'testbuild' branch in 'force' scheduler.Bastien Montagne
2014-07-22Cleanup: pep8 & redundant varsCampbell Barton
2014-07-20Update buildbot config to latest actual versionSergey Sharybin
2014-07-19CMake FindOpenEXR.cmake was using OPENEXR_VERSION unsetCampbell Barton
2014-07-10Fix compilation error with scons when building from detached headSergey Sharybin
2014-07-10Attempt to fix compilation error on 32bit OSX and SConsSergey Sharybin
2014-07-09Buildbot: enable cubins fox OSXSergey Sharybin
With new buildbot env they should be all fine.
2014-07-08Install_deps: minor cleanup.Bastien Montagne
Patch D633 by simonrepp (Simon Repp), thx.
2014-07-04OSX: Jpeg2000 was formely handled by quicktime, after QT removal it was ↵Jens Verwiebe
forgotten to move it to openjpeg, doing this now Note: In releases this was missing since 2.69, so we may want an ‘a’ release for 2.71
2014-07-04Install_deps: Final (hopefully!) fix for dual clang/cfe name (*sigh*).Bastien Montagne
Patch by simonrepp (Simon Repp), thanks!
2014-07-04Fix the ABIFLAGS order for detecting Python debug buildsCampbell Barton
D631 by mva
2014-07-02Fix scons unable to build with sources tar archive (no git repo available in ↵Bastien Montagne
this case). Reported by Clouclou over IRC, thanks!
2014-06-29Install_deps: fix for clang url issue.Bastien Montagne
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-27Update Ceres to latest upstream versionSergey Sharybin
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-26Another attempt to solve compilation errorSergey Sharybin
Sorry for the noise, but it's tricky to troubleshoot stuff which only happens on buildbot..
2014-06-26Tweak to previous commit, fixes scons to survive when upstream is not foundSergey Sharybin
2014-06-26Fix compilation error with scons and older pythonsSergey Sharybin
2014-06-26Windows: Enable numpy again, as we do have libs again for vc2013 and against ↵Thomas Dinges
py3.4.
2014-06-23Use specified exception mask for buildinfoSergey Sharybin
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-20Fix scons building in case git is not available.Bastien Montagne
Not so nice to use try/except here, but simplest solution to avoid failing in case git commands fail for some reason...
2014-06-19Python: Remove deprecated uses of os.popenCampbell Barton
T40415 by Lawrence D'Oliveiro