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-09-18CMake: remove PYTHON_NUMPY_INCLUDE_DIRS as a cache variable on macOS/Windows.Brecht Van Lommel
It's in a fixed location on those platforms, and having it as a cache variable just means things break when we upgrade to a new Python version.
2018-09-12Merge branch 'master' into blender2.8Campbell Barton
2018-09-11Build: require OpenJPEG 2.x minimum, remove bundled version.Brecht Van Lommel
* WITH_SYSTEM_OPENJPEG is removed and is now always on, this was already the case for macOS and Windows. * This should not break existing Linx builds. If there is no new enough OpenJPEG installed, CMake will no find libopenjp2 and WITH_IMAGE_OPENJPEG will be disabled. * install_deps.sh was updated with new package names, since distributions put this version in a new package. Differential Revision: https://developer.blender.org/D3663
2018-09-03Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/collision.c
2018-09-03Spelling fixes in comments and descriptions, patch by luzpaz.Brecht Van Lommel
Differential Revision: https://developer.blender.org/D3668
2018-08-29MSVC: Set the warning C4189 from level 4 to level 3mano-wii
This is a useful warning and there is an equivalent used in `GNUC` and `clang` compilers. Reviewed on IRC by @brecht and @LazyDodo
2018-08-28Merge branch 'master' into blender2.8Brecht Van Lommel
2018-08-28cmake: adjustments required for lib-upgrade on windows.Ray Molenkamp
2018-08-23Merge branch 'master' into blender2.8Bastien Montagne
2018-08-23Cycles: Add option for building CUDA kernels sequentiallyLukas Stockner
Building the CUDA kernels takes quite a bit of memory, and when building all of them the combined usage can be too much on some systems (especially VMs). Therefore, this patch adds an option to force the build system to build them sequentially by making each build step depend on the previous kernel. Reviewers: brecht, sergey Differential Revision: https://developer.blender.org/D3623
2018-08-18Merge branch 'master' into blender2.8Campbell Barton
2018-08-17cmake: fix typo in else()Ray Molenkamp
2018-08-17cmake/ctest: output test binaries to debug/release folders on windows.Ray Molenkamp
debug/release builds were writing the binaries to the same folder
2018-08-13Subsurf: Introduce quality optionSergey Sharybin
For users it defines how accurate vertex positions are in terms of limit surface (as in, how close the vertices locations to the condition when they are calculated for an infinitely subdivided mesh). This affects things like: - Irregular vertices (joint of 3 or more edges) - Crease Keep quality value low for performance. NOTE: Going higher does not necessarily mean real improvement in quality, ideal case might be reached well before maximum quality of 10. Quality of 3 is a good starting point. Internally quality is translated directly to adaptive subdivision level. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D3599
2018-07-31Fix build error in new build after recent merge.Brecht Van Lommel
2018-07-30Merge branch 'master' into blender2.8Brecht Van Lommel
2018-07-30Build: require C11/C++11 for all operating systems in master.Brecht Van Lommel
This is in preparation of upgrading our library dependencies, some of which need C++11. We already use C++11 in blender2.8 and for Windows and macOS, so this just affects Linux. On many distributions this will not require any changes, on some install_deps.sh will need to be run again to rebuild libraries. Differential Revision: https://developer.blender.org/D3568
2018-07-30Merge branch 'master' into blender2.8Campbell Barton
2018-07-30CMake: omit superfluous Up-to-date messagesCampbell Barton
Causes a lot of noise when building the install target.
2018-07-23Merge branch 'master' into blender2.8Brecht Van Lommel
2018-07-23Fix build for Intel compiler with C++11.Milan Jaros
2018-07-10Merge branch 'master' into blender2.8Sergey Sharybin
2018-07-10CMake: Disable OpenAL and JACK when AUDASPACE is disabledSergey Sharybin
Previously CMake was raising a fatal error, which wasn't too helpful. There is still some fatal messages about Audaspace and Game Engine, but the latter one is on it's EOL and is removed in Blender 2.8.
2018-06-28Merge branch 'master' into blender2.8Campbell Barton
2018-06-28CMake: enable WITH_ASSERT_ABORT by defaultCampbell Barton
Assert from BLI_assert by default in debug builds (instead of just printing a warning). Some developers ignored this, causing errors for others. Better debug builds cause hard error so code isn't ignored. Disabling is still useful when bisecting or testing outdated code.
2018-06-22Merge branch 'master' into blender2.8Sergey 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-17Merge branch 'master' into blender2.8Campbell Barton
2018-06-17Cleanup: trailing space in CMake filesCampbell Barton
2018-06-16This option limits visibility of the glew.h header to just bf_gpu and ↵Ray Molenkamp
intern_gawain this is to highlight areas in the code that still directly do opengl calls or use opengl types. This is in preparation for supporting alternative rendering back-ends. Reviewers: brecht, fclem Differential Revision: https://developer.blender.org/D3304
2018-06-12T55454: removal of clay engineJeroen Bakker
The ClayEngine was introduced to test the blender2.8 architecture during development. As currently we have the wanted features implemented with matcaps we are going to remove the clay engine as it was never intended to be an official releasable engine Note: The test cases are never run. But when enabled will be skipped as they were implemented over the Clay Engine
2018-06-10Merge branch 'master' into blender2.8Campbell Barton
2018-06-10Cleanup: trailing space in CMake filesCampbell Barton
2018-06-08Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_sequencer.h source/blender/blenkernel/intern/sequencer.c source/blender/editors/curve/editcurve_paint.c source/blender/editors/gpencil/gpencil_edit.c source/blender/editors/gpencil/gpencil_paint.c source/blender/editors/gpencil/gpencil_utils.c source/blender/editors/include/ED_object.h source/blender/editors/include/ED_view3d.h source/blender/editors/interface/interface_eyedropper_depth.c source/blender/editors/render/render_opengl.c source/blender/editors/sculpt_paint/paint_image_proj.c source/blender/editors/sculpt_paint/sculpt.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/space_view3d/view3d_intern.h source/blender/editors/space_view3d/view3d_select.c source/blender/editors/space_view3d/view3d_utils.c source/blender/editors/transform/transform_conversions.c source/blender/editors/transform/transform_snap.c source/blender/python/intern/gpu_offscreen.c source/blender/windowmanager/intern/wm_files.c
2018-06-08CMake: disable WITH_COMPILER_ASAN for CMAKE_BUILD_TYPE ReleaseJeroen Bakker
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-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-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-18Merge branch 'master' into blender2.8Campbell Barton
2018-05-18CMake: Add WITH_COMPILER_ASAN optionCampbell Barton
This supports easy toggling of Address Sanitizer.
2018-05-18Cleanup: remove deprecated definitionsCampbell Barton
2018-05-09Remove Frame ServerCampbell Barton
This feature is limited (only byte PPM output, no multi-view), only works with specific configurations. This also causes some maintenance overhead when testing changes to the render pipeline.
2018-04-17Removing Blender Game Engine from Blender 2.8Dalai Felinto
Folders removed entirely: * //extern/recastnavigation * //intern/decklink * //intern/moto * //source/blender/editors/space_logic * //source/blenderplayer * //source/gameengine This includes DNA data and any reference to the BGE code in Blender itself. We are bumping the subversion. Pending tasks: * Tile/clamp code in image editor draw code. * Viewport drawing code (so much of this will go away because of BI removal that we can wait until then to remove this.
2018-04-17Disable GAME ENGINE from the build optionsDalai Felinto
2018-04-03Merge branch 'master' into blender2.8Campbell Barton
2018-04-02Build: add WITH_OPENVDB_3_ABI_COMPATIBLE option.Brecht Van Lommel
Better fix for T54457. It seems Debian compiles OpenVDB without ABI 3 compatibility, while Arch does enable it as is the default in the OpeVDB CMake build system. So now there's an option that the distribution can set depending on how they compile their OpenVDB package.
2018-04-02Build: fixes for the Intel compiler versions 2016, 2017, 2018.Milan Jaros
Differential Revision: https://developer.blender.org/D3109
2018-03-23Merge branch 'master' into blender2.8Sergey Sharybin