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-11-07Merge blender2.8 branch.Bastien Montagne
Means that from now on, we work based on blender2.8, no more master! Conflicts: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/depsgraph/intern/builder/deg_builder_nodes.cc source/blender/editors/interface/interface_ops.c source/blender/makesdna/DNA_ID.h source/blender/makesrna/intern/rna_ID.c
2017-11-06Merge branch 'master' into id_override_staticBastien Montagne
Conflicts: source/blender/editors/interface/interface_handlers.c
2017-11-05Merge branch 'master' into blender2.8Campbell Barton
2017-11-05Cleanup: order buffer length after the bufferCampbell Barton
2017-11-02Merge branch 'master' into blender2.8Campbell Barton
2017-11-01UI: Add UILayout.operator_menu_holdCampbell Barton
This is an operator button that opens a menu when the button is held.
2017-10-19Merge branch 'master' into id_override_staticBastien Montagne
2017-10-18Merge branch 'master' into blender2.8Campbell Barton
2017-10-18Cleanup: Use const for RNA EnumPropertyItem argsCampbell Barton
Practically all access to enum data is read-only.
2017-10-14Merge branch 'master' into id_override_staticBastien Montagne
2017-10-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/screen/screen_edit.c
2017-10-12Fix T52999: floating (popup) panels/menus could jump around screen in some ↵Bastien Montagne
cases. Would happen during panel's refresh drawing, if drawing code had to adjust final panel position compared to the initial one computed based on the mouse coordinates, and user had dragged the floating panel around. Issue fixed by adjusting stored mouse coordinates once final panel position is known, such that they would directly generate those coordinates. that way, the basic offset applied to those stored mouse coordinates during panel dragging is valid, and recreating panel based on those won't make it jump in screen. Note that panel will still jump in case user dragged it partially out of view - we could prevent that, but imho it's better to keep that behavior, since redraw can generate a popup of different size, which could end up with a totally out-of-view one... Hopefully this fix does not break anything else!
2017-09-21Merge branch 'master' into id_override_staticBastien Montagne
2017-09-19Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-18Add some security checks against future bad float UIprecision values.Bastien Montagne
This commit and previous one should be backported to 2.79a should we release it.
2017-09-18Merge branch 'master' into blender2.8Campbell Barton
2017-09-18Cleanup: use clamped rounding functionsCampbell Barton
2017-09-18Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-17UI: avoid int cast before clamping number inputCampbell Barton
Values outside int range would overflow.
2017-08-20Cleanup: move gawain header out of GPU_matrixCampbell Barton
Avoids requiring glew headers in Python API.
2017-08-10Merge branch 'id_copy_refactor' into id_override_staticBastien Montagne
2017-08-03Merge branch 'master' into blender2.8Campbell Barton
2017-08-01Fix multi-units drawing re precision handling.Bastien Montagne
This is still far from prefect, but yet much better than what we had so far (more consistent with inheritent precision available in floats). Note that this fixes some (currently commented out) units unittests, and requires adjusting some others, will be done in next commit.
2017-08-01Merge branch 'master' into blender2.8Campbell Barton
2017-07-31Fix two issues with recent changes to number display while editing them.Bastien Montagne
* Numbers with units (especially, angles) where not handled correctly regarding number of significant digits (spotted by @brecht in T52222 comment, thanks). * Zero value has no valid log, need to take that into account!
2017-07-28Merge branch 'master' into blender2.8Campbell Barton
2017-07-27Fix T51776: Make sure button icons are updated on Ctrl-ScrollWheelJeff Knox
2017-07-27Fix button text overlapping with shortcut text in popupsJulian Eisel
The purpose of the keymap strings is probably for un-embossed menu items like seen in most pulldowns. I can't see a reason for also adding that string for regularly drawn buttons within popups, we don't add it anywhere else in the UI either. So this commit makes sure shortcut strings are only added to buttons that are drawn like pulldown-menu items.
2017-07-27Fix button text overlapping with shortcut text in popupsJulian Eisel
The purpose of the keymap strings is probably for un-embossed menu items like seen in most pulldowns. I can't see a reason for also adding that string for regularly drawn buttons within popups, we don't add it anywhere else in the UI either. So this commit makes sure shortcut strings are only added to buttons that are drawn like pulldown-menu items.
2017-07-19Merge branch 'master' into blender2.8Campbell Barton
2017-07-18Merge branch 'master' into id_override_staticBastien Montagne
2017-07-18Fix bad loss of precision when manually editing values in numbuttons.Bastien Montagne
While drawing nice 'rounded' values is OK also for 'low precision' editing like dragging and such, it's quite an issue when you type in a precise value, validate, edit again the value, and find a rounded version of it instead of what you typed in! So now, *only when entering textedit of num buttons*, we always get the highest reasonable precision for floats (and use exponential notation when values are too low or too high, to avoid tremendous amounts of zero's).
2017-07-17Merge branch 'master' into id_override_staticBastien Montagne
Conflicts: source/blender/blenkernel/BKE_library.h
2017-06-26Merge branch 'master' into blender2.8Campbell Barton
2017-06-26Merge branch 'master' into blender2.8Campbell Barton
2017-06-26Building w/o Python works againCampbell Barton
2017-06-23Fix T51845raa
2017-06-21Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-06-20Fix: Icon alignment for scaled pie buttons with no textraa
2017-06-14Cleanup/expose template status in RNA utils API.Bastien Montagne
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-12UI: Add template_search (version of template_ID for non-IDs)Julian Eisel
Adds a version of template_ID that can be used for non-ID properties. The property to search for and the collection to search in has to be passed to it. Like template_ID it also takes arguments to define a 'new' and 'unlink' operator. They will be displayed as icon-only buttons then. Also added a version that can display preview thumbnails. Had to do some additional changes to make text-buttons support displaying/modifying empty RNA properties. This will be needed for workspaces, see D2451. Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D2666
2017-05-05Merge branch 'master' into blender2.8Julian Eisel
2017-05-05Revert "Add red alert in UI controls for datablock pointer properties"Julian Eisel
This reverts commit f5bc8ad4ce87165fc0648f1cd8c0ae1fb5f07281. We agreed there needs to be a better solution for this, see comments in rBf5bc8ad4ce87165.
2017-04-19Get rid of glMatrixMode callsSergey Sharybin
With the explicit calls we don't need to worry about current state outside of the GPU module now. In fact. we don't need to worry about current matrix mode in core profile at all. Legacy OpenGL now has some code which ensures current matrix mode when using explicit calls to push/pop matrix.
2017-04-19Make UI block drawing closer to masterSergey Sharybin
There is no need to break assumptions of what's being modified by this call and what's restored. The changes in this function simply spread crappyness outside of the UI block.
2017-04-13Merge branch 'master' into blender2.8Alexander Romanov
2017-04-13Add red alert in UI controls for datablock pointer propertiesAlexander Romanov
2017-03-28Merge branch 'master' into id_override_staticBastien Montagne
2017-03-28Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_window.c