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
2017-05-02Merge branch 'master' into blender2.8Sergey Sharybin
2017-04-30fix typo in WITH_SYSTEM_GFLOG in CMakeLists.txtlazydodo
2017-04-27fix Clay compatibility commentMike Erwin
When building WITH_LEGACY_OPENGL, Mac uses GL 2.1, Mesa uses GL 3.0. Has nothing to do with Intel! Clay assumes GL 3.3 is available.
2017-04-27Merge branch 'master' into blender2.8Campbell Barton
2017-04-27Cleanup: spellingCampbell Barton
2017-04-25group WITH_LEGACY_OPENGL with the other GL optionsMike Erwin
Blender subsystems that care about OpenGL use GL_DEFINITIONS, which now includes the newest (temporary) WITH_LEGACY_OPENGL. Also updated Gawain's CMake to use this instead of its own logic.
2017-04-24Merge branch 'master' into blender2.8Campbell Barton
2017-04-23CMake: Fix CMake for non Apple systemsThomas Beck
Follow up to https://developer.blender.org/rB14a4ce6d7fb4dcf3d1aa5b58f9a543549df6d5dc apple_check_quicktime() macro is only defined for apple, so ignore it otherwise.
2017-04-23CMake: move some Apple specific code into platform_apple_xcode.cmake.Brecht Van Lommel
2017-04-22OpenGL: remove use of GLEW MXMike Erwin
MX (Multiple conteXt) support was dropped from the GLEW 2.0 library to make core profile support cleaner. Our WITH_GLEW_MX build option was OFF by default already; this commit removes the inactive code paths. I'm working on a plan for multiple GPUs, contexts, resource sharing, etc. This commit gives us a cleaner starting point for that upcoming work. Tested on Mac, will test on Linux & Windows immediately after pushing.
2017-04-21Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-21CMake: Add option to build against system-wide GlogSergey Sharybin
Similar to previous commit for Gflags.
2017-04-21Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-21CMake: Add option to link against system-wide Gflags librarySergey Sharybin
It is disabled by default, so should not affect existing configurations. Main benefits of this goes as: - Linux distros can use that to avoid libraries duplication and link blender package against gflags package from the system. - It it easier to test whether Blender works with updated version of Gflags prior to re-bundling the library.
2017-04-14Add fatal error in CMake when trying to build WITH_GAMEENGINE but without ↵Bastien Montagne
WITH_LEGACY_OPENGL This won't work currently.
2017-04-13OpenGL: do not support legacy matrix when using core profileDalai Felinto
2017-04-06New build option WITH_LEGACY_OPENGLDalai Felinto
This introduces a new CMake option - WITH_LEGACY_OPENGL. Without this option things may not draw perfectly, however, we should soon be able to build with OpenGL core profile. The matrix-related api calls are (still) not handled here (glTranslate, ...). There seems to be no consensus on whether to make this build option the default. We can talk about this later. For now two things are the priority: (1) To get rid of deprecated calls when WITH_LEGACY_OPENGL is ON (2) To make core profile work for Mesa/Mac when WITH_LEGACY_OPENGL is OFF Reviewers: merwin, sergey, campbellbarton Differential Revision: https://developer.blender.org/D2603 Many thanks for Sergey Sharybin for the help.
2017-03-23OpenGL: remove GLU option from build systemMike Erwin
Also remove linking in glu libs. T49042 is now done!
2017-03-11Merge branch 'master' into blender2.8Campbell Barton
2017-03-11Cleanup: code style & cmakeCampbell Barton
2017-03-06Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_nla/nla_draw.c source/blender/editors/space_view3d/view3d_draw.c
2017-03-05CMake: confine WIN32 optionsCampbell Barton
2017-02-17Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/animation/anim_draw.c
2017-02-10CTests: Initial work to cover Cycles nodes with OpenGL testsSergey Sharybin
Works similar to regular Cycles tests, just does OpenGL render to get output image. Seems to work fine with the only funny effect: Blender window will pop up for each of the tests. This is current limitation of our OpenGL context. Might be changed in the future.
2017-02-07Clay-Engine (merge clay-engine)Clément Foucault
Initial work by Clément Foucault with contributions from Dalai Felinto (mainly per-collection engine settings logic, and depsgraph iterator placeholder). This makes Blender require OpenGL 3.3. Which means Intel graphic card and OSX will break. Disable CLAY_ENGINE in CMake in those cases. This is a prototype render engine intended to help the design of real render engines. This is mainly an engine with enphasis in matcap and ambient occlusion. Implemented Features -------------------- * Clay Render Engine, following the new API, to be used as reference for future engines * A more complete Matcap customization with more options * Per-Collection render engine settings * New Ground Truth AO - not enabled Missing Features ---------------- * Finish object edit mode - Fix shaders to use new matrix - Fix artifacts when edge does off screen - Fix depth issue - Selection sillhouette - Mesh wires - Use mesh normals (for higher quality matcap) - Non-Mesh objects drawing - Widget drawing - Performance issues * Finish mesh edit mode - Derived-Mesh-less edit mode API (mesh_rende.c) * General edit mode - Per-collection edit mode settings * General engines - Per-collection engine settings (they are their, but they still need to be flushed by depsgraph, and used by the drawing code)
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-27CMake: Fix typoSergej Reich
2016-12-29Merge branch 'master' into blender2.8Bastien Montagne
Please **DO NOT** add changes from master when it's totally uneeded! Changes to BLI_ area most certainly shall *always* be done in master, there is absolutely no point in adding more diff between the two branches than needed, will only makes merging more cumbersome! Conflicts: CMakeLists.txt source/blender/blenlib/intern/math_vector_inline.c
2016-12-29Edits to user prefs NDOF UIAaron Carlisle
Small changes: - Remove "NDOF" from each setting - Change tooltip for deadzone - Unrelated typo in cmake comment Reviewers: merwin, Severin Reviewed By: merwin, Severin Tags: #bf_blender, #user_interface Differential Revision: https://developer.blender.org/D2319
2016-12-24[MSVC] Fix test for C++11 support for vc2015/2017 based on D2432 by Ulysse ↵Ulysse Martin
Martin (youle)
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-04CMake: disable QuickTime with macOS SDK 10.12+, no longer supported by Apple.Brecht Van Lommel
2016-11-29Fix C++11 building on MSVC 2015Mike Erwin
Newest 2017 not yet supported because i don't know its version symbol...
2016-11-29Default to C++11 for all compilers (2.8)Mike Erwin
This fixes multiple problems on latest Mac OS + Xcode. Hopefully does not cause any on other platforms. The Xcode detection logic could use further cleanup. It's checking several old versions that are unsupported for Blender 2.8+ development.
2016-11-05change default for quicktime suport for macOS to offMartijn Berger
2016-11-02CMake: Make ld.gold linker optionalSergey Sharybin
Some platforms are having hard time using this linker so added an option to not use it. The options is an advanced one and enabled by default so should not cause any changes for current users.
2016-11-02CMake: Fix use of some option which was never definedSergey Sharybin
This way it seems more logical to me.
2016-10-22Fix T49657: Audio backend "Jack" should be named "JACK".Jörg Müller
2016-10-19Fix T49793 : Fix enabling SSE2 globally for msvc.lazydodo
When feeding msvc both /arch:sse2 and /arch:sse it's not smart enough to pick the best option, just goes with the last option
2016-10-09CMake changes for new macOS target 10.9 / libc++ libraries.Brecht Van Lommel
Differential Revision: https://developer.blender.org/D2283
2016-10-03Cycles CUDA: make CUDA 8.0 the officially supported version for all platforms.Brecht Van Lommel
2016-09-14CMake: decouple WITH_CYCLES_OPENSUBDIV from WITH_OPENSUBDIV, and enable on OS X.Brecht Van Lommel
Reviewed By: sergey Differential Revision: https://developer.blender.org/D2227
2016-09-06[cmake/cpack] allow override of package namelazydodo
Cpack generates a standard filename with git information in it, which might not always be wanted for release builds, this patch adds an option to override that default filename. Reviewers: sergey, juicyfruit Reviewed By: juicyfruit Differential Revision: https://developer.blender.org/D2199 ammended to fix: wrong variable name in main CMakeLists.txt
2016-09-06[cmake/cpack] allow override of package namelazydodo
Cpack generates a standard filename with git information in it, which might not always be wanted for release builds, this patch adds an option to override that default filename. Reviewers: sergey, juicyfruit Reviewed By: juicyfruit Differential Revision: https://developer.blender.org/D2199
2016-08-31[Windows] Add support for code signing the final binaries.lazydodo
The option is controlled with the WITH_WINDOWS_CODESIGN option and needs: - Signtool must be found on the system, the standard windows sdk folders will be searched for it. - The path to the pfx file (WINDOWS_CODESIGN_PFX) - The password for the pfx , this can either be set by the WINDOWS_CODESIGN_PFX_PASSWORD variable but given that ends up in CMakeCache.txt (which might be undesirable) there is a backup option of setting the PFXPASSWORD environment variable on the system. Reviewers: sergey, juicyfruit Reviewed By: juicyfruit Tags: #bf_blender, #platform:_windows Differential Revision: https://developer.blender.org/D2182
2016-08-23D2078 Windows : add option to prevent find_package from picking up the wrong ↵lazydodo
libraries and use hardcoded paths instead.
2016-08-17CMake: Move main platform checks to separate filesSergey Sharybin
Basically title says it all. The goal is to make platform maintenance easier, so you don't have to constantly scroll back and forth looking for if() branches to check which exact platform you're currently working on. Ideally we also would move option defaults to a platform files, but that i'm not sure how to implement in a nice way yet. Reviewers: mont29 Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2148
2016-08-09CMake: Once again, don't use find_package to get hardcoded librariesSergey Sharybin
2016-08-09CMake: Remove hardcoded DIR_ROOT for alembic and MinGWSergey Sharybin
Do it for until precompiled libraries are there so we can allow MinGW users to compile their own library and pass it via ROOT_DIR.
2016-08-09CMake: Use proper way to define debug/release libraries for alembicSergey Sharybin
Please do not spread platform+library specific code all over the CMake file, we already have sections dedicated to that.