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-02-02Merge branch 'master' into blender2.8Campbell Barton
2018-02-01Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmakeRay Molenkamp
Differential Revision: https://developer.blender.org/D3032
2018-01-30Merge branch 'master' into blender2.8Sergey Sharybin
2018-01-30Cleanup: warning, spellingCampbell Barton
2017-12-04Cleanup: whitespaceCampbell Barton
2017-11-23Rename any instance of scene layer or render layer in code with view layerDalai Felinto
The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22Depsgraph: Remove debug only codeSergey Sharybin
2017-11-09Depsgraph: Make dependency graph to be built from scene layerSergey Sharybin
This is a final step of having proper ownership. Now selecting different layers in the "top bar" will actually do what this is expected to do. Surely, there are still things to be done under the hood, that will happen in a less intrusive way.
2017-11-08Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-07Depsgraph: Simplify some workarounds and make API closer to finalSergey Sharybin
2017-11-07Windows: Add additional crash diagnostic information.Ray Molenkamp
To help diagnose issues like T53259, it is useful to know the module causing the issue (is it us, or some opengl icd, or python module?) and while we cannot do stackdumps on release builds on windows, it is possible to display the faulting module. This commit changes the exception handler to output the following information: Error : EXCEPTION_ACCESS_VIOLATION (Type of exception , this we had before) Address : 0x0000000140193726 (Address of the exception, new) Module : k:\BlenderGit\build_windows_Full_noge_x64_vc15_Release\bin\Release\blender.exe (module of the exception, new)
2017-11-07Depsgraph: Fix/workaround crash when rendering from command lineSergey Sharybin
Need to ensure Render has proper dependency graph. While this is a subject of re-design (render pipeline should manage all dependency graphs it needs, and not demand external users to provide depsgraph), this is good to have something working, so we can run regression tests and such.
2017-11-07Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-07macOS: remove old OpenMP lib stuff from cmakeArto Kitula
2017-10-19Merge branch 'master' into blender2.8Campbell Barton
2017-10-19Correct last commit, use WM_exitCampbell Barton
Without this temp directory isn't removed.
2017-10-19Exit with invalid command line argumentsCampbell Barton
Loading blender with an unknown name would interpret it as a blend file. This meant passing `--arg` arguments would end up creating new blend files which could be confusing if you made a typo on a command line argument. Now check the string has a blend file extension, exiting if it doesn't.
2017-10-18Depsgraph: Make Copy-on-Write a command line optionSergey Sharybin
Before it was a compile time option which was not very easy to use or test. Now the project is getting more mature, so very soon we will be able to call for a public tests of limited features. The copy-on-write (which includes animation, modifiers) is enabled using --enable-copy-on-write command line argument.
2017-10-16Workspace: Move engines to workspace and Properties Editor cleanupDalai Felinto
Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842
2017-10-09Merge branch 'master' into blender2.8Campbell Barton
2017-10-08Cleanup: --help textCampbell Barton
Sync with manual
2017-09-29Merge branch 'master' into blender2.8Campbell Barton
2017-09-28macOS: officially upgrade to 10.9 libraries from lib/darwin.Brecht Van Lommel
This removes a bunch of code that is no longer needed, and running "make update" will now automatically download the new libraries. Differential Revision: https://developer.blender.org/D2861
2017-09-27--debug-gpu-shader: Dump GLSL shaders to diskDalai Felinto
This is really convenient for development. Either for profiling the generated shaders or to check if the generated code is correct. It writes the shaders to the temporary blender session folder.
2017-09-25Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-22Remove quicktime supportAaron Carlisle
It has been deprecated since at least macOS 10.9 and fully removed in 10.12. I am unsure if we should remove it only in 2.8. But you cannot build blender with it supported when using a modern xcode version anyway so I would tend towards just removing it also for 2.79 if that ever happens. Reviewers: mont29, dfelinto, juicyfruit, brecht Reviewed By: mont29, brecht Subscribers: Blendify, brecht Maniphest Tasks: T52807 Differential Revision: https://developer.blender.org/D2333
2017-09-22Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-21CMake: Add extra requests dependenciesSergey Sharybin
Apparently, we already had some code to deal with this. So for now just added some extra dependencies needed for latest requests.
2017-09-20[cmake/msvc] Update python to 3.6 + numpy to 1.13.1Ray Molenkamp
2017-09-19Audaspace: removing old device backend names.Joerg Mueller
2017-09-15Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-14Fix T52653: Render output of linked scenes conflicts with other scenes with ↵Sergey Sharybin
the same name The issue was caused by render result identifier only consist of scene name, which could indeed cause conflicts. On the one hand, there are quite some areas in Blender where we need identifier to be unique to properly address things. Usually this is required for sub-data of IDs, like bones. On another hand, it's not that hard to support this particular case and avoid possible frustration. The idea is, we add library name to render identifier for linked scenes. We use library name and not pointer so we preserve render results through undo stack. Reviewers: campbellbarton, mont29, brecht Reviewed By: mont29 Differential Revision: https://developer.blender.org/D2836
2017-08-15Merge branch 'master' into blender2.8Brecht Van Lommel
2017-08-15macOS build: simplify python install for new 10.9 libraries.Brecht Van Lommel
We stop using the .zip file and just have all files now in lib/darwin/python/lib, along with numpy, numpy headers and requests. This makes it consistent with Linux and simplifies code. For old libraries the .zip stays, code for that gets removed when we fully switch to new libraries.
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-26Merge branch 'master' into blender2.8Campbell Barton
2017-05-25Fix blender player python installation on macOS after recent changes.Brecht Van Lommel
2017-05-25Merge branch 'master' into blender2.8Brecht Van Lommel
2017-05-25Fix macOS python cmake install to work when switching lib directories.Brecht Van Lommel
It's a bit ugly but I couldn't find a better way to keep fast installs and correct handling of switching between master and blender2.8 with different lib directories.
2017-05-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c
2017-05-21[msvc] Use debug nunmpy archive for debug buildslazydodo
2017-05-19OpenGL: remove -noglsl option & GPU_extensions_disableMike Erwin
Also removed a leftover reference to the old basic-shader-glsl option.
2017-04-28Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-27Revert "Fix T51328: Add note to cmdline help that threads must be first"Campbell Barton
The help message already notes that argument order matters, and this doesn't need to be the first.
2017-04-27Merge branch 'master' into blender2.8Campbell Barton
2017-04-27Fix T51328: Add note to cmdline help that threads must be firstAaron Carlisle
2017-04-21Draw Manager: edit-mode 3d text drawingCampbell Barton
Draw cursor and selection, also support for fast-display.
2017-04-06Depsgraph: Remove old depsgraph headers from creatorSergey Sharybin