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
2015-03-06Cleanup: quiet minilzo warningsCampbell Barton
2015-03-05CMake: Need to find pugixml.hpp instead of pugixml.hSergey Sharybin
That's how file is actually called in the upstream.
2015-03-05CMake: mark lib/debug options advancedCampbell Barton
2015-02-27cleanup: typosCampbell Barton
2015-02-25error in last commitCampbell Barton
2015-02-25CMake: error making get_blender_version a functionCampbell Barton
Incorrect use of PARENT_SCOPE meant the vars would be used uninitialized elsewhere.
2015-02-18CMake: remove expression in endif(...)Campbell Barton
2015-02-16Ensure CMake finds SDL 2.0Sybren A. Stüvel
CMake 2.8 doesn't search /usr/include/SDL2, which is the include directory for SDL 2.x on Ubuntu Linux (and possibly others). This results in SDL 1.2 headers being found when WITH_SDL_DYNLOAD=OFF, and our shipped SDL 2.0 headers when WITH_SDL_DYNLOAD=ON. This patch ensures that in both cases the correct SDL headers are used. Reviewers: sergey, campbellbarton Projects: #bf_blender Differential Revision: https://developer.blender.org/D1112
2015-02-14CMake: Add search path for jemalloc which corresponds to own and studio setupSergey Sharybin
2015-02-13cleanupCampbell Barton
2015-02-10CMake cleanup: Move OSL detection code into FindOpenShadingLanguage.cmakeSergey Sharybin
Should be no functional changes.
2015-02-06Some tweaks to support upcoming OSL-1.6Sergey Sharybin
Doesn't mean we're 100% ready for the transition, but need to start somewhere anyway. Changes: - OSL is no longer supporting cpp and requires usage of Boost Wave. So now Wave component of Boost is optionally demanded when looking for the Boost libraries if OSL is enabled. Only did this for Linux, MSVC seems already using Wave. Not sure about OSX. - Because of the same reason OSL should be moved prior Boost for linker. - Whole archive trick makes it so linking fails with duplicated symbols, so removed it for the new OSL. Didn't see issues with this so far. - Added some code to check OSL version on Linux. Would need to move all that to FindOpenShadingLanguage.cmake which we can get from Cycles standalone repository. So in theory no affect on current stup would be made at all. - Added some tweaks to buildbot files. It now seems to be happy with the new OSL libraries, but again, those tweaks are not in action yet. All this was tested on Linux only. Win/OSX might still need some tweaks to support new OSL. P.S. This doesn't mean we're pushing OSL update yet, just making some preliminary tweaks to avoid entropy of PITA when we'll actually want to switch.
2015-02-05CMake: add PLATFORM_LINKFLAGS to CMAKE_(SHARED|MODULE)_LINKER_FLAGSCampbell Barton
D750 by @leszekswirski Need for compiling Blender as a Python module in Windows.
2015-01-28Added default install location from install_deps.sh to FindOpenEXR.cmakeSergey Sharybin
Patch by Oliver Weissbarth, thanks! Differential Revision: https://developer.blender.org/D907
2015-01-22CMake: Auto-detect path to idiff application in FindOpenImageIO.cmakeSergey Sharybin
Not used at this moment, but will be real soon with new ctests.
2015-01-20Moved the cloth solver code into a new subfolder/library inside BlenderLukas Tönne
code. The implicit solver itself should remain agnostic to the specifics of the Blender data (cloth vs. hair). This way we could avoid the bloated data conversion chain from particles/hair to derived mesh to cloth modifier to implicit solver data and back. Every step in this chain adds overhead as well as rounding errors and a possibility for bugs, not to speak of making the code horribly complicated. The new subfolder is named "physics" since it should be the start of a somewhat "unified" physics systems combining all the various solvers in the same place and managing things like synchronized time steps.
2015-01-09Fix for GTestCampbell Barton
2015-01-08Fix gtest linking on ubuntu and do minor cleanup.Antony Riakiotakis
Generally for build systems, libraries that do not depend on other libraries, such as system libraries, OpenGL etc always go at the end. We could even get rid of some duplicate dependency libraries here but auto duplication by build systems and differences between OSs make this difficult. GTest still duplicates all libraries twice to solve some issues which is weird (maybe libs are not sorted correctly for some reason? needs investigation)
2015-01-03GTest was broken on LinuxCampbell Barton
2014-12-31Cycles: Post-reintegration tweaks to ensure things do compileSergey Sharybin
This commit contains all the tweaks which were missing in initial patch re-integration from the standalone Cycles repository. This commit also contains an utility cmake macro to help linking targets with different libraries for release/debug builds, the name currently is target_link_libraries_decoupled it gets a target and list of libraries and makes sure debug builds are using libraries with "_d" suffix. After all this changes it'll hopefully be easier to interchange patches between blender and standalone repositories, because they're now quite identical.
2014-12-31Cycles: Fix compilation error when OIIO is compiled with external PugiXML parserSergey Sharybin
Basic idea is to check whether OIIO is compiled with embedded PugiXML parser and if so use PugiXML from OIIO, otherwise find a standalone PugiXML library.
2014-12-29Small fix for QTCreator project script, by Sybren Stüvel.Lukas Tönne
Either ./blender-git or ~/blender-git should be used, but not .~/blender-git. This patch fixes that, by choosing ~/blender-git, in line with the last CLI argument.
2014-12-29CMake: Add check for whether OIIO has bundled pugixml librarySergey Sharybin
Will become handy when we'll be re-integrating changes from Cycles standalone repository back to blender.
2014-12-01Cleanup: warningsCampbell Barton
2014-11-18Revert "OSX/cpack: add a dummy bg and ds_store for dmg"Campbell Barton
This reverts commit 5f7b273236fc09ad4752529b964e0e1d6c681979. Binary files for release should be added to svn lib from now on.
2014-11-18OSX/cpack: add a dummy bg and ds_store for dmgJens Verwiebe
2014-11-17CMake: update lite configCampbell Barton
2014-11-17Support dynamic loading of SDL librariesSergey Sharybin
This is mainly to address old issue when one need to have SDL library installed in order to use our official builds. Some hip distros already installs SDL, but it's not quite the same across all the variety of the distros. We also now switching to SDL-2.0, most of the distros have it in repositories already, so it shouldn't be huge deal to install it if needed. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D878
2014-11-16Error in last commitCampbell Barton
2014-11-16CMake: cleanup, namespace & unused varsCampbell Barton
also add macro 'print_all_vars()', if(0)'d - debugging only.
2014-11-15Cmake windows. Make sure we install blender player.Martijn Berger
Add blenderplayer component so you can speicfy to install this in the installer
2014-11-13CMake: add 'make full' targetCampbell Barton
2014-11-13CMake buildbot change upload should work nowMartijn Berger
CPack generating NSIS and WiX installers should also work
2014-11-04Cleanup: spelling (D831)Campbell Barton
2014-10-30Fix project-file generators (didn't close files)Campbell Barton
2014-10-15CMake: Add a flag to explicitly disable SSE/SSE2 intrinsicsSergey Sharybin
The flag is called WITH_CPU_SSE, it is ON by default so no one should be affected by the change really. This should hopefully fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763755
2014-10-08Ghost Context RefactorJason Wilkins
https://developer.blender.org/D643 Separates graphics context creation from window code in Ghost so that they can vary separately.
2014-09-18Cleanup: use static sets where possibleCampbell Barton
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-02CMake: add headerCampbell Barton
2014-07-28CMake: add glew-mx libraryCampbell Barton
2014-07-28CMake: use our template for finding the glew libraryCampbell Barton
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-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-19CMake FindOpenEXR.cmake was using OPENEXR_VERSION unsetCampbell Barton
2014-07-04Fix the ABIFLAGS order for detecting Python debug buildsCampbell Barton
D631 by mva
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