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-08-07Merge branch 'master' into blender2.8Brecht Van Lommel
2017-08-07Build: add scripts to build dependencies for Windows and macOS.Brecht Van Lommel
Note these are intended for platform maintainers, we do not intend to support users making their own builds with these. For that precompiled libraries from lib/ should be used. Implemented by Martijn Berger, Ray Molenkamp and Brecht Van Lommel. Differential Revision: https://developer.blender.org/D2753
2017-07-18Merge branch 'master' into blender2.8Campbell Barton
2017-07-17Buildbot: Switch to GCC-7 for Linux build slavesSergey Sharybin
This is GCC version was used for Testbuild1 and Testbuild2.
2017-06-27Merge branch 'master' into blender2.8Campbell Barton
2017-06-26Enable optional jack in install_deps.shBastien Montagne
Based on D2578, now you can install JACK audio server and use it in Blender build without having to specify the `--with-all` option (that one still enables also JACK of course). Reviewers: mont29 Maniphest Tasks: T51033 Differential Revision: https://developer.blender.org/D2578
2017-06-26Manipulator: Python APICampbell Barton
Initial support for Python/Manipulator integration from 'custom-manipulators' branch. Supports: - Registering custom manipulators & manipulator-groups. - Modifying RNA properties, custom values via get/set callbacks, or invoking an operator. - Drawing shape presets for Python defined manipulators (arrow, circle, face-maps) Limitations: - Only float properties supported. - Drawing only supported via shape presets. (we'll likely want a way to define custom geometry or draw directly). - When to refresh, recalculate manipulators will likely need integration with notifier system. Development will be continued in the 2.8 branch
2017-06-21Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-06-21Fix typo in builtbot configDalai Felinto
2017-06-09Merge branch 'master' into blender2.8Campbell Barton
2017-06-09install_depsh: update OpenCollada to 1.6.51, and OIIO to 1.7.15Bastien Montagne
2017-06-09Merge branch 'master' into blender2.8Campbell Barton
2017-06-08Cleanup: cmake indentation, missing includeCampbell Barton
2017-06-08WM: move manipulator library into editorsCampbell Barton
As with operators, the window-manager has the API for defining, the editor can implement and register its own manipulators. This exposes wmManipulator, keeping it opaque isn't practical if editors and Python are to implement their own.
2017-06-07Merge branch 'master' into blender2.8Sergey Sharybin
2017-06-07Collada: Add search path which is used default by it's SCons build systemSergey Sharybin
2017-06-01Main Workspace IntegrationJulian Eisel
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup) Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know! (Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.) == Main Changes/Features * Introduces the new Workspaces as data-blocks. * Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces. * Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces). * Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead. * Store screen-layouts (`bScreen`) per workspace. * Store an active screen-layout per workspace. Changing the workspace will enable this layout. * Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.) * Store an active render layer per workspace. * Moved mode switch from 3D View header to Info Editor header. * Store active scene in window (not directly workspace related, but overlaps quite a bit). * Removed 'Use Global Scene' User Preference option. * Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well. * Default .blend only contains one workspace ("General"). * Support appending workspaces. Opening files without UI and commandline rendering should work fine. Note that the UI is temporary! We plan to introduce a new global topbar that contains the workspace options and tabs for switching workspaces. == Technical Notes * Workspaces are data-blocks. * Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now. * A workspace can be active in multiple windows at the same time. * The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned). * The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that). * Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs. * `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those. * Added scene operators `SCENE_OT_`. Was previously done through screen operators. == BPY API Changes * Removed `Screen.scene`, added `Window.scene` * Removed `UserPreferencesView.use_global_scene` * Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces` * Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer` * Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name) == What's left? * There are a few open design questions (T50521). We should find the needed answers and implement them. * Allow adding and removing individual workspaces from workspace configuration (needs UI design). * Get the override system ready and support overrides per workspace. * Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc). * Allow enabling add-ons per workspace. * Support custom workspace keymaps. * Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later. * Get the topbar done. * Workspaces need a proper icon, current one is just a placeholder :) Reviewed By: campbellbarton, mont29 Tags: #user_interface, #bf_blender_2.8 Maniphest Tasks: T50521 Differential Revision: https://developer.blender.org/D2451
2017-05-28Merge branch 'master' into blender2.8Bastien Montagne
2017-05-27Remove MinGW supportAaron Carlisle
The Issue ======= For a long time now MinGW has been unsupported and unmaintained and at this point, it looks like something that we should just leave behind and move on. Why Remove ========== One of the big motivations for MinGW back in the day is that it was free compared to MSVC which was licensed based. However, now that this is no longer true we have basically stopped updating the need CMake files. Along with the CMake files, there are several patches to the extern libs needed to make this work. For example, see: https://developer.blender.org/diffusion/B/browse/master/extern/carve/patches/mingw_w64.patch If we wanted to keep MinGW then we would need to make more custom patches to the external libs and this is not something our platform maintainers are willing to do. For example, here is the patches needed to build python: https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-python3 Fixes T51301 Differential Revision: https://developer.blender.org/D2648
2017-05-19Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/depsgraph_tag.cc source/blender/editors/mask/mask_draw.c
2017-05-18Install_deps: py 3.5.3, collada 22b1f4ff026881b4 (2.6.47), OCIO 6de971097c7f5.Bastien Montagne
2017-04-27Merge branch 'master' into blender2.8Campbell Barton
2017-04-27Cleanup: spellingCampbell Barton
2017-04-26Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/alembic/intern/abc_exporter.cc
2017-04-26OSX buildbot: remove redundant optionJens Verwiebe
2017-04-26OSX buildbot: disable unsupported calls for now and use quicktime off defaultJens Verwiebe
2017-04-25Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-25Fix OSX buildbotJens Verwiebe
2017-04-24Merge branch 'master' into blender2.8Campbell Barton
2017-04-23CMake: move some Apple specific code into platform_apple_xcode.cmake.Brecht Van Lommel
2017-04-23CMake: disable WITH_CODEC_QUICKTIME for macOS > 10.11 for configurations.Romain Foyard
QtKit was removed in macOS Sierra, this patch disables WITH_CODEC_QUICKTIME in Sierra and greater versions of macOS. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2645
2017-04-23Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: build_files/cmake/platform/platform_apple.cmake
2017-04-22OSX: satisfy macro to also apply alembic testsJens Verwiebe
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-21[cmake] Fix Alembic build errors with msvclazydodo
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-18Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-04-18Fix install_deps.sh for new Ubuntu 17.04, which does not have libopenjpeg!Bastien Montagne
2017-04-14Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/alembic/intern/abc_exporter.cc
2017-04-14Buildbot: Fix typosSergey Sharybin
2017-04-14Buildbot: Attempt to fix CUDA compilation on OSXSergey Sharybin
Stupid toolkit is really fragile about CLang version.
2017-04-11Use immediate mode API for OpenColorIOSergey Sharybin
2017-04-10Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/gpencil/drawgpencil.c
2017-04-10Install deps: Fix compilation error of AlembicLuca Rood
Couple of things here: - Boost is not necesserily compiled into your /opt/lib and system-wide version might have been used. The recent change in Alembic did not take this into account. - Alembic needs some extra component of Boost. This part might be missing now for other distros than DEB.
2017-04-09Merge branch 'master' into blender2.8Campbell Barton
2017-04-07Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/alembic/intern/abc_exporter.h # source/blender/alembic/intern/abc_util.cc
2017-04-07Buildbot: List freetype for OIIO librariesSergey Sharybin
OIIO in release environment is compiled with Freetype support. This fixes compilation error of static unit tests.