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-24tweaks to packman buildCampbell Barton
remove --asroot arg to makepkg
2015-03-07InstallDeps: Fix stupid typo which broke OIIO building (and nobody reported ↵Bastien Montagne
it :| ).
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-05Update install_deps for recent CMake changeCampbell Barton
2015-03-05CMake: mark lib/debug options advancedCampbell Barton
2015-03-03Windows: Add stacktrace support when unhandled exception occurs.Antony Riakiotakis
We need to register the exception handler slightly differently here, as well as adding DbgHelp as a library, but according to docs it should be supported in recent Windows editions (Win XP included even). We can try it first and revert if there are issues.
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-19Fix Cycles OpenCL error with scons, util_math_fast.h was missing.øThomas Dinges
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-10Synchronize changes from buildbot serverSergey Sharybin
2015-02-10CMake cleanup: Move OSL detection code into FindOpenShadingLanguage.cmakeSergey Sharybin
Should be no functional changes.
2015-02-06Fix for scons + mingw64 warning flags fixJoshua Leung
So, it turns out my changes here the other day were a bit too over-eager: -Wdeclaration-after-statement and -Wstrict-prototypes only applied to C code and not C++ (which that set of flags was getting included for too). However, -Wno-char-subscripts is fine where it is now, so I've left it in place
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-02-04Compiler warnings tweak for scons + mingw64Joshua Leung
The warning flags in C_WARN were not actually getting included (most notably, the one disabling the pointless + braindead one about using chars to index into arrays - given that we only use unsigned chars everywhere). Maybe this should get done for the other scons platforms too?
2015-02-03Install_deps: update to new exr/oiio versions, and (hopefully) fix ILMBase messBastien Montagne
Root of the issue is an (hidden!) parameter in ILMBase cmake options, that is enabled by default, and force the generation of those ugly lib names (Imf_2_2.so & co). Why why why enable such thing by default? Anyway, it should be simpler to build again even on linuxes having the openexr -dev package installed. Also, cleaned up a bit things, now we can switch between repo and plain release archive building from a single place for each lib, instead of commentting/uncommenting everything each time (for libs where we have some git repo set up for some reason).
2015-02-02Make MSVC 2013 win32 also use new OpenEXR 2.2Martijn Berger
2015-02-02Bump OpenEXR to 2.2 for windows MSVC 2013Martijn Berger
2015-01-29cleanup: shebang linesCampbell Barton
D888 by @sambler
2015-01-29cleanup: pep8Campbell Barton
also remove empty class parenthesis
2015-01-28Update scons build documentationSergey Sharybin
- fix dead blender.org link (build dependencies) - rewrite $BLENDERHOME/{config,tools}/* to $BLENDERHOME/build_files/scons/{config,tools}/* Patch by David Creswick, thanks! Reviewers: jesterking Differential Revision: https://developer.blender.org/D798
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-28Switch windows MSVC builds to OpenAL-softMartijn Berger
2015-01-26Change exception syntax to be more modern and hopefully fix buildbot issue ↵Martijn Berger
in the process
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-08exclude git/arc files from tgz archiveCampbell Barton
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-31Remove executable flag from the build configuration filesSergey Sharybin
They're not intended to be executed directly and seems mode change happened by accident. Setting -x for this files to avoid possible incidents by trying to run this files in shell.
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-10Switch to numpy 1.9 for windows platformSergey Sharybin
2014-12-08Cycles: Fix compilation error with MinGW and logging enabledSergey Sharybin
2014-12-07Input Method Editor (IME) support for text buttonsSeverin
Original patch by @random (D765) with some minor work done by @campbell and me. At this place, I'd like call out a number of people who were involved and deserve a big "Thank you!": * At the first place @randon who developed and submitted the patch * The Blendercn community which helped a lot with testing - espacially * @yuzukyo, @leon_cheung and @kjym3 * @campbellbarton, @mont29 and @sergey for their help and advises during * review * @ton who realized the importance of this early on and asked me for * reviewing We are still not finished, as this is only the first part of the implementaion, but there's more to come!
2014-12-05Fix scons+mingw64 compiling - Ensure WITH_BF_CYCLES_LOGGING is defined and ↵Joshua Leung
turned off
2014-12-04Buildbot: Enable sm_52 for OSXSergey Sharybin
This actually enables it in the darwin scons config, that's how it always used to be configured there.
2014-12-03Cycles: Enable logging by defaultSergey Sharybin
Default configuration already includes libmv and glog, so all the dependencies are met. And logging is nice to have anyway. This wouldn't give any slowdown, because all the logging is silenced unless '--debug-cycles', plus no logging is done from the speed critical code.
2014-12-03Cycles: Support logging when building with SConsSergey Sharybin
Basically, title says ti all, the option is called WITH_BF_CYCLES_LOGGING
2014-12-02Cycles: Enable native sm_52 kernel for Windows.Thomas Dinges
2014-12-02Enable sm52 for linux buildbotSergey Sharybin
Status of other builders: - Windows are not known for me, would ask Martijn to look into - OSX buildbot still needs a CUDA toolkit update