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-05-19Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/windowmanager/intern/wm_playanim.c
2015-05-19CMake: install Python executable when its bundledCampbell Barton
2015-05-19CMake: remove temp assignment, unused varsCampbell Barton
2015-05-14Merge branch 'master' into gooseberrySergey Sharybin
Conflicts: build_files/scons/tools/Blender.py source/blender/blenkernel/intern/mesh.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle_system.c source/blender/editors/interface/interface_handlers.c
2015-05-12Depsgraph: New dependency graph integration commitSergey Sharybin
This commit integrates the work done so far on the new dependency graph system, where goal was to replace legacy depsgraph with the new one, supporting loads of neat features like: - More granular dependency relation nature, which solves issues with fake cycles in the dependencies. - Move towards all-animatable, by better integration of drivers into the system. - Lay down some basis for upcoming copy-on-write, overrides and so on. The new system is living side-by-side with the previous one and disabled by default, so nothing will become suddenly broken. The way to enable new depsgraph is to pass `--new-depsgraph` command line argument. It's a bit early to consider the system production-ready, there are some TODOs and issues were discovered during the merge period, they'll be addressed ASAP. But it's important to merge, because it's the only way to attract artists to really start testing this system. There are number of assorted documents related on the design of the new system: * http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents * http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph There are also some user-related information online: * http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/ * http://code.blender.org/2015/03/more-dependency-graph-tricks/ Kudos to everyone who was involved into the project: - Joshua "Aligorith" Leung -- design specification, initial code - Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes - Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the project and so - Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the issues and recording/writing documentation. - Everyone else who i forgot to mention here :)
2015-05-06Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/object/object_shapekey.c
2015-05-06[cmake] move FindLLVM to its own fileMartijn Berger
2015-05-04Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/space_sequencer/sequencer_draw.c
2015-05-04CMake: Only consider it INFO is ld.gold is missingCampbell Barton
2015-05-02CMake: use ld.gold linker when availableCampbell Barton
Gives noticeable speedup linking blender
2015-04-30Merge branch 'master' into gooseberryAntony Riakiotakis
2015-04-30CMake: Solve compilation error from path with a spaceSergey Sharybin
2015-04-28Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: intern/cycles/blender/blender_object.cpp intern/cycles/blender/blender_sync.h source/blender/editors/interface/interface_utils.c
2015-04-28Use gnu89 for GCCCampbell Barton
GCC5 defaults to gnu11, which we may switch to later but disable for now to prevent accidental use.
2015-04-28Merge branch 'alembic' into gooseberryLukas Tönne
2015-04-27Alembic: Minor tweak to disabling hdf5 if alembic does not support itSergey Sharybin
Mainly just suppresses meaningless message if hdf5 is already disabled in cmake.
2015-04-24Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/space_view3d/view3d_edit.c
2015-04-24CMake: add -Wformat-signednessCampbell Barton
2015-04-21Alembic: Make alembic's HDF5 library optionalSergey Sharybin
This way blender will be happy about alembic compiled without HDF5 support.
2015-04-20Merge branch 'master' into alembicBastien Montagne
2015-04-20CMake: Move performance tests under the cmake optionSergey Sharybin
This way running full sweep of regression tests does not require waiting for the performance test to finish.
2015-04-20Merge branch 'master' into alembicLukas Tönne
2015-04-19Fix T44449, sm_52 kernel missing in CMake builds.Thomas Dinges
2015-03-31Merge branch 'master' into alembicLukas Tönne
Conflicts: source/blender/blenloader/intern/readfile.c source/blender/editors/space_view3d/view3d_intern.h source/blender/makesdna/DNA_modifier_types.h source/blender/makesrna/intern/rna_modifier.c source/blender/modifiers/MOD_modifiertypes.h source/blender/modifiers/intern/MOD_util.c
2015-03-27CMake: Enable strict flags for C++Sergey Sharybin
2015-03-26Initial Alembic library integration for Blender.Lukas Tönne
Adds Alembic as a dependency and build support in cmake and scons. Also extends the install_deps.sh script with a temporary installation procedure for the Alembic libraries. This is still very hackish and needs to be improved.
2015-03-24CMake: tweak recent py module changesCampbell Barton
support installing portable builds to CMAKE_INSTALL_PREFIX
2015-03-24Fix for building blender as a Python moduleCampbell Barton
Installation didn't work on debian distro's now install into PYTHON_SITE_PACKAGES (which is detected and can be configured).
2015-03-20Disable IME for headless buildsCampbell Barton
2015-03-19CMake: unbundle eigen3Campbell Barton
Optionally use systems eigen3 library. T41989 by @hasufell with edits
2015-03-13Initial compilation support with C++11 featureset enabledSergey Sharybin
This commit makes some preliminary fixes and tweaks aimed to make blender compilable with C++11 feature set. This includes: - Build system attribute to enable C++11 featureset. It's for sure default OFF, but easy to enable to have a play around with it and make sure all the stuff is compilable before we go C++11 for real. - Changes in Compositor to use non-named cl_int structure fields. This is because __STRICT_ANSI__ is defined by default by GCC and OpenCL does not use named fields in this case. - Changes to TYPE_CHECK() related on lack of typeof() in C++11 This uses decltype() instead with some trickery to make sure returned type is not a reference. - Changes for auto_ptr in Freestyle This actually conditionally switches between auto_ptr and unique_ptr since auto_ptr is deprecated in C++11. Seems to be not strictly needed but still nice to be ready for such an update anyway/ This all based on changes form depsgraph_refactor branch apart from the weird changes which were made in order to support MinGW compilation. Those parts of change would need to be carefully reviewed again after official move to gcc49 in MinGW. Tested on Linux with GCC-4.7 and Clang-3.5, other platforms are not tested and likely needs some more tweaks. Reviewers: campbellbarton, juicyfruit, mont29, lukastoenne, psy-fi, kjym3 Differential Revision: https://developer.blender.org/D1089
2015-03-13error in last commitCampbell Barton
2015-03-13CMake: unbundle LZO libraryCampbell Barton
Patch T41989 by @hasufell
2015-03-05CMake: rename LLVM_DIRECTORY -> LLVM_ROOT_DIRCampbell Barton
Matching convention with all other libs
2015-03-05CMake: was defaulting to an old LLVM versionCampbell Barton
Made finding LLVM fail. only use LLVM_VERSION if set, else set to installed version
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-23Debug GPU functionality from soc-viewport_fx by Jason WilkinsAntony Riakiotakis
patch number D706 with changes: - WITH_GPU_DEBUG just creates a debug context (and enables the debug messaging system functions) but leaves the checks we had intact. Old patch added the debug functionality only if we had the flag on to save some performance. Rationale here is that we might not want to recompile blender just to get the extra information, and having users start blender with a -d flag to get the extra information is also useful for bug reports. Those checks already existed and most expensive ones are hidden behind a debug mode check so performance should not be that bad. - Did some cleanup of existing functionality: When things go wrong blender side, just print the error, don't check for GL errors first. - Did not port changes needed for GLES to regular glew.h - Got rid of duplicate or very similar new functionality. Generally, code is more moving things around/cleanup and should work exactly as before apart from the debug context, so it's safe to add even now. It also provides a nice substitute function for glu error descriptions
2015-02-18CMake: remove expression in endif(...)Campbell Barton
2015-02-18CMake: indent & missing headerCampbell 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: Enable JeMalloc by defaultSergey Sharybin
It's really handy to have blender linked against jemalloc because of much better memory fragmentation handling by that library. To be noted: if jemalloc library is not found it'll be disabled with message about that, no compilation error should happen.
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-03MinGW still uses SDL1 - will need to change this of course but no needAntony Riakiotakis
to keep compilation broken for now
2015-02-02Bump OpenEXR to 2.2 for windows MSVC 2013Martijn Berger
2015-01-27Correct path to mingw64 libs so some minimal blender subset is possible to ↵Sergey Sharybin
be compiled with older gcc
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-16Select appropriate folder for MinGW-w64 gcc 4.9Antony Riakiotakis
2015-01-09Fix for GTestCampbell Barton