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-10-07Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_contextJason Wilkins
2014-10-04Cycles: Add support for debug passesSergey Sharybin
Currently only summed number of traversal steps and intersections used by the camera ray intersection pass is implemented, but in the future we will support more debug passes which would help checking what things makes the scene slow. Example of such extra passes could be number of bounces, time spent on the shader tree evaluation and so. Implementation from the Cycles side is pretty much straightforward, could only mention here that it's a build-time option disabled by default. From the blender side it's implemented as a PASS_DEBUG with several subtypes possible. This way we don't need to create an extra DNA pass type for each of the debug passes, saving us a bits. Reviewers: campbellbarton Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D813
2014-10-02Libmv: Add an option to disable schur specializations build-timeSergey Sharybin
This way folks with few ram or those who wants to hack into Ceres code might compile Blender much faster.
2014-09-25Cycles: Add support of Glog loggingSergey Sharybin
This commit makes it possible to use Glog library for the debug logging. For now only possible when using CMake and in order to use the logging the WITH_CYCLES_LOGGING configuration variable is to be enabled. When this option is not enabled or when using Scons there's no difference in Cycles behavior at all, when using logging and no output to the console impact is gonna to be minimal. This is done in order to make it possible to have debug logging persistent in code (without need to add it when troubleshooting some bug and removing it afterwards). For now actual logging is not placed yet, only all the functions needed for the logging are written and so.
2014-09-18Cleanup: style, spellingCampbell Barton
2014-09-17OSX/cmake: OSX 10.10 must be used with cmake 3.0.0 minimum, older thinks ↵Jens Verwiebe
10.6 is higher than 10.10 :)
2014-09-17Merge branch 'master' into soc-2014-viewport_contextCampbell Barton
2014-09-14Fix Cycles Standalone compile.Thomas Dinges
2014-09-12OSX: Fix cmake3 usageJens Verwiebe
2014-09-01Merge branch 'master' into soc-2014-viewport_contextAntony Riakiotakis
Also fix scons issues with SDL. There is still a linking problem somewhere but i expect this is an issue in master as well. Conflicts: intern/cycles/SConscript intern/ghost/CMakeLists.txt intern/ghost/intern/GHOST_WindowX11.cpp source/blender/nodes/CMakeLists.txt
2014-08-13Fix linking error on VC 2013: Update lib names for openexrDaniel Genrich
2014-08-06OSX/cmake: allow for llvm dynamic builds too, but prefer staticJens Verwiebe
2014-08-05OSX/cmake: move last commited line to a better placeJens Verwiebe
2014-08-05OSX/cmake: force LLVM_STATIC ON, to fix linking issuesJens Verwiebe
2014-08-03Merge branch 'master' into soc-2014-viewport_contextJason Wilkins
2014-08-03Fixed linking OIIO on Windows. The debug and optimized options need to be ↵Jason Wilkins
before each individual library in a list.
2014-08-03OSX/buildsystem: prepare usage on OSX 10.10 - YosemiteJens Verwiebe
- important: requires cmake >= 2.8.12 to read minor version right, aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )
2014-08-02Merge branch 'master' into soc-2014-viewport_contextCampbell Barton
Conflicts: intern/ghost/intern/GHOST_WindowWin32.cpp
2014-08-02Move to OIIO 1.4 also for windows x86Martijn Berger
2014-08-01CMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO)Campbell Barton
2014-08-01Cmake prefers NOT to !Martijn Berger
2014-08-01Fix msvc 2013 / win64 to use new OIIO and llvm and resulting linkingMartijn Berger
requirements
2014-07-31moved bf_intern_glew_mx to setup_linklibsJason Wilkins
2014-07-31Made glew-mx more easily extendable by creating a MXContext struct to put ↵Jason Wilkins
additional data in. Renamed the mx functions to more closely match their analogs in other systems. mxCreateContext now also calls glewInit
2014-07-30Default LLVM_STATIC to OFF (it's kinda broken currently, gives various ↵Bastien Montagne
linking issues).
2014-07-30Add Opengl include (same as master)Campbell Barton
without this freebsd fails since OpenGL is in /usr/local/include
2014-07-29OSX/cmake: fix linking utf-functions if llvm is disabledJens Verwiebe
2014-07-29Warning cleanup and remove unused functionCampbell Barton
2014-07-29fixed so that linking with libGLESv2 or libGL is based on WITH_GL_PROFILE_* ↵Jason Wilkins
and linking with libEGL is determined by WITH_GL_EGL
2014-07-28removed support for building with GLX on OSXJason Wilkins
2014-07-28Fix for building with system glewCampbell Barton
2014-07-28Merge branch 'master' into soc-2014-viewport_contextCampbell Barton
Conflicts: CMakeLists.txt
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-27Merge branch 'master' into soc-2014-viewport_contextCampbell Barton
Conflicts: intern/ghost/intern/GHOST_SystemWin32.cpp intern/ghost/intern/GHOST_WindowWin32.cpp
2014-07-27CMake/MSVC: use '/SAFESEH:NO' linker flag, needed for some systens (D682)Campbell Barton
2014-07-27Rename GLEW_MX -> WITH_GLEW_MX define to match similar definesCampbell Barton
Also minor edits for glew-mx docstring.
2014-07-26OSX/cmake: little tweak for last commitJens Verwiebe
2014-07-26OSX/cmake: update buildsys for new osl/llvm/oiio usage, also use ↵Jens Verwiebe
osx_locals.map in cmake - fixes T40887
2014-07-25Merge branch 'master' into soc-2014-viewport_contextCampbell Barton
Conflicts: CMakeLists.txt
2014-07-25CMake: use a list for PLATFORM_LINKLIBSCampbell Barton
2014-07-24removed options for XInput and XF86Vidmode on OSX because they are not ↵Jason Wilkins
available for XQuartz
2014-07-23[Ghost Context Refactor] initial commit based on code review of ↵Jason Wilkins
https://developer.blender.org/D643
2014-07-15Selective changes picked from: e01449fa4bb0df252d32a3b98ee1e8f195923d96Martijn Berger
Author: Jason Wilkins Improves cmake's ability to find our libraries on Windows / MSVC 2013
2014-07-09OSX/CMAKE: Way better fix for T40887, checks where failing with clang-ompJens Verwiebe
- found a way to feed just extra flags to the testcompiles
2014-07-08OSX/CMAKE: extend my former workaround for failing tests with clang-omp to ↵Jens Verwiebe
all build types - this workaround makes sure the breaking -fopenmp is not exposed to testcompiles which use C_FLAGS respective CXX_Flags - -fopenmp is always added to the CMAKE_C(XX)_FLAGS_<BUILD_TYPE> now - another way to solve this would be to move the Configure OpenMP part after all line 2366, but i don’t know if this would be apreciated
2014-07-08OSX/cmake: more work on T40887 and a tentative fixJens Verwiebe
- test fail due libiomp5 is not available @ testing time - must solve this by adding requred flags/includes to tests - atm release builds are possible with this hack
2014-07-08BLI_string, dont pass unicode to ascii BLI_str_partition functionsCampbell Barton
2014-07-07OSX/cmake: Real fix for T40887, the reason was find_package(OpenMP) silently ↵Jens Verwiebe
failing, breaking all other tests following - tested gcc 4.8.1 works again - tested clang-omp in libs works again - i assume atm., if we only use vanilla clang it is the one in darwin libs
2014-07-01CMake: correct include dirsCampbell Barton