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
2018-06-29Merge branch 'master' into blender2.8Campbell Barton
2018-06-29Cleanup: trailing newlinesCampbell Barton
2018-06-29Merge branch 'master' into blender2.8Campbell Barton
2018-06-29Cleanup: trailing newlinesCampbell Barton
2018-06-27CMake: fix linking blendontCampbell Barton
2018-06-25Merge branch 'master' into blender2.8Campbell Barton
2018-06-25CMake: correct remove_strict_cxx_flags_fileCampbell Barton
Was still using C-flags.
2018-06-22Merge branch 'master' into blender2.8Sergey Sharybin
2018-06-22CMake: Make language explicit for per-file strict flags removalSergey Sharybin
2018-06-22CMake: Cleanup, add_cc_flag -> add_c_flagSergey Sharybin
2018-06-22CMake: Cleanup, rename CC_REMOVE_STRICT_FLAGS to C_REMOVE_STRICT_FLAGSSergey Sharybin
2018-06-22CMake: Tweaks to removal of strict flagsSergey Sharybin
Silences the following strict flags from external libraries: - -Wclass-memaccess - -Wswitch - -Wtype-limits - -Wint-in-bool-context Needed to tweak macro a bit, since the old logic was wrong: we can not use CXX flags for C compiler, need way more strict separation between what goes where.
2018-06-18Merge remote-tracking branch 'origin/master' into blender2.8Ray Molenkamp
2018-06-18make.bat: Fix msvc-2017 detection.Ray Molenkamp
D3485 by @manung Differential Revision: https://developer.blender.org/D3485
2018-06-17Merge branch 'master' into blender2.8Campbell Barton
2018-06-17Cleanup: trailing space cmake, make.batCampbell Barton
2018-06-16Merge remote-tracking branch 'origin/master' into blender2.8Ray Molenkamp
2018-06-16make.bat: Fix `make showhashes` not working.Ray Molenkamp
broke in recent refactor.
2018-06-10Merge branch 'master' into blender2.8Campbell Barton
2018-06-10Cleanup: trailing space in CMake filesCampbell Barton
2018-06-06Merge branch 'master' into blender2.8Campbell Barton
2018-06-05make.bat : move all experimental options to their own section in the help.Ray Molenkamp
2018-06-05make.bat : bring the help up to date with recent additions to the build script.Ray Molenkamp
2018-06-05make.bat : check for existence of ninja before using it.Ray Molenkamp
2018-06-05make.bat: change the way the vs buildtools are detected.Ray Molenkamp
The recent change also used the buildtools instead of the regular compiler, you now have to explicitly state what you want to use : 2017 - the standard msvc compiler 2017pre - the msvc compiler from the preview installation 2017b - the msvc compiler from the buildtools installation
2018-06-05Merge branch 'master' into 28Campbell Barton
2018-06-05make.bat: cache the vcredist directory.Ray Molenkamp
When run from make.bat the environment is setup correctly and the VCToolsRedistDir environment variable exists, on later invocations of cmake this may no longer be the case and a warning was emitted about the missing runtime. we can't rely on InstallRequiredSystemLibraries.cmake here since it uses the compiler version to figure out the correct location and it doesn't know how to deal with clang.
2018-06-05make.bat : Fix clang+asan msbuild project generationRay Molenkamp
2018-06-03Merge branch 'master' into blender2.8Campbell Barton
2018-06-02build_environment: support for msvc2017 and newer cmake.Ray Molenkamp
-expanded build_deps.cmd with 2017 support, it can't locate msvc2017 so needs to be run from developer prompt. -Newer cmake was unhappy with openal's cmakelists.txt -collada has warning as error on and errored out on new msvc2017 warnings.
2018-06-02build_environment: fix paths in osl.diffRay Molenkamp
2018-06-01Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/io/io_collada.c source/blender/editors/object/object_bake.c source/blender/editors/object/object_edit.c source/blender/editors/render/render_internal.c source/blender/makesrna/intern/rna_object_api.c source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-01Math: optimizations for 4x4x matrix inverse, multiplications.Brecht Van Lommel
In some heavy rigs matrix inverse can be 10% of computation time. This reduces it to 2% by using Eigen's optimized 4x4 matrix inverse and SSE matrix multiplication.
2018-05-31Add Asan support for clang on windows.Ray Molenkamp
This will currently only work for the RelWithDebInfo configuration since asan does not support the debug crt. for source line information in the reports, you need a copy of llvm-symbolizer in the blender folder or set the ASAN_SYMBOLIZER_PATH environment variable to point to it. Currently (as of 6.0.0) llvm-symbolizer does not ship with the binary clang/llvm distribution. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D3446
2018-05-31Merge branch 'master' into blender2.8Campbell Barton
2018-05-30make.bat: fix support for building with just the build tools installed.Ray Molenkamp
2018-05-29Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_material.h source/blender/blenkernel/BKE_mesh.h source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/material.c source/blender/editors/object/object_relations.c source/blender/editors/render/render_preview.c source/blender/makesrna/intern/rna_object.c
2018-05-29make.bat : fix release build not getting the right settings.Ray Molenkamp
2018-05-29Merge remote-tracking branch 'origin/master' into blender2.8Ray Molenkamp
2018-05-29make.bat : improve error message while detecting the msvc runtime when using ↵Ray Molenkamp
clang
2018-05-29Merge remote-tracking branch 'origin/master' into blender2.8Ray Molenkamp
2018-05-29make.bat : add support for building with ninja and clang together.Ray Molenkamp
2018-05-28Merge remote-tracking branch 'origin/master' into blender2.8Ray Molenkamp
2018-05-28Windows: Add support for building with clang.Ray Molenkamp
This commit contains the minimum to make clang build/work with blender, asan and ninja build support is forthcoming Things to note: 1) Builds and runs, and is able to pass all tests (except for the freestyle_stroke_material.blend test which was broken at that time for all platforms by the looks of it) 2) It's slightly faster than msvc when using cycles. (time in seconds, on an i7-3370) victor_cpu msvc:3099.51 clang:2796.43 pavillon_barcelona_cpu msvc:1872.05 clang:1827.72 koro_cpu msvc:1097.58 clang:1006.51 fishy_cat_cpu msvc:815.37 clang:722.2 classroom_cpu msvc:1705.39 clang:1575.43 bmw27_cpu msvc:552.38 clang:561.53 barbershop_interior_cpu msvc:2134.93 clang:1922.33 3) clang on windows uses a drop in replacement for the Microsoft cl.exe (takes some of the Microsoft parameters, but not all, and takes some of the clang parameters but not all) and uses ms headers + libraries + linker, so you still need visual studio installed and will use our existing vc14 svn libs. 4) X64 only currently, X86 builds but crashes on startup. 5) Tested with llvm/clang 6.0.0 6) Requires visual studio integration, available at https://github.com/LazyDodo/llvm-vs2017-integration 7) The Microsoft compiler spawns a few copies of cl in parallel to get faster build times, clang doesn't, so the build time is 3-4x slower than with msvc. 8) No openmp support yet. Have not looked at this much, the binary distribution of clang doesn't seem to include it on windows. 9) No ASAN support yet, some of the sanitizers can be made to work, but it was decided to leave support out of this commit. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D3304
2018-05-27Merge branch 'master' into blender2.8Campbell Barton
2018-05-27make.bat : Fix builtime.txt being written in the wrong folder.Ray Molenkamp
2018-05-26make.bat: Add support for building with ninja.Ray Molenkamp
ninja is an alternative to msbuild designed for fast rebuilds. However there is no IDE support, builds only from the command line. Comparison between msbuild and ninja for a full build, build time in seconds. Full Clean Build msbuild 867.5 Ninja 801.2 Difference -66.3 (-7.6%) Minor Change msbuild 43.0 Ninja 14.9 Difference -28.1 (-64.4%) No Changes msbuild 23.0 Ninja 6.1 Difference -16.9 (-73.5%)
2018-05-26make.bat: refactor make.batRay Molenkamp
make.bat was starting to become hard to maintain, this refactors it into separate batch files for each stage of the process. -Improved detection of msvc2013/2015 -Improved failure handling. -Added check for working msbuild and C++ compiler -Added verbose switch to ease trouble shooting. -Added Check if svn/cmake/git are in the path before using them -Display the build configuration before asking to download the libraries -Offer an option to recover an interrupted checkout of the libraries. -Automatically check out sub-modules in-case they are missing.
2018-05-23UI: Global "Status-bar" Area (WIP)Julian Eisel
* Add horizontal bar at bottom of all non-temp windows, similar to the Top-bar. * Status-bar is hidden in UI-less fullscreen mode * Current contents are preliminary and based on T54861: ** Left: Current file-path if needed. "(Modified)" note if file was changed. ** Center: Scene statistics (like in 2.7 Info Editor). ** Right: Progress-bars and reports * Internally managed as own "STATUSBAR" editor-type (hidden in UI). * Like with the Top-bar, Status-bar data and SDNA writing is disabled. * Most changes in low-level screen/area code are to support layout bounds that differ from window bounds. Design task: T54861 Main changes approved by @brecht.
2018-05-13Build deps: avoid ffmpeg external crystalhd library dependency.Brecht Van Lommel