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-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-06-01Merge branch 'master' into blender2.8Julian Eisel
2017-06-01Remove comment (missed last commit)Campbell Barton
2017-06-01Fix T51651: translate w/ individual origins failsCampbell Barton
Regression in fix for T46892
2017-05-26Cleanup: warningCampbell Barton
2017-05-24Remove TexFace, per-face imagesCampbell Barton
TexFace complicates the now more popular shading pipeline by having per-face images, see: T51382 for details. To keep the ability to select a per-material edit-image (used with UV-mapping workflow), the material now stores an image which will be set when changing images in edit-mode. This is used as a bake-target when not using Cycles too.
2017-05-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c
2017-05-22Fix T51169: Push/pull fails w/ local lock axisCampbell Barton
2017-05-20Merge branch 'master' into blender2.8Campbell Barton
2017-05-20CMake: Use GCC7's -Wimplicit-fallthrough=5Campbell Barton
Use to avoid accidental missing break statements, use ATTR_FALLTHROUGH to suppress.
2017-05-16Merge branch 'master' into blender2.8Campbell Barton
2017-05-16Cleanup: gcc7.1 warningsCampbell Barton
2017-05-10Fix T51354: Final take on multi-view (single view) issuesDalai Felinto
We now handle selection and transform manipulators (kudos to Julian Eisel to help hunting down the latter).
2017-05-01Reworked version of dashed line shader.Bastien Montagne
Using geometry shader allows us to get rid of the 'line origin' extra vertex attribute, which means dashed shader no longer requires fiddling with those vertex attributes definition, and, most importantly, does not require anymore special drawing code! As you can see, this makes code much simpler, and much less verbose, especially in complex cases. In addition, changed how dashes are handled, to have two 'modes', a simple one with single color (using default "color" uniform name), and a more advanced one allowing more complex and multi-color patterns. Note that since GLSL 1.2 does not support geometry shaders, a hack was added for now (which gives solid lines, but at least does not make Blender crash).
2017-04-27Getting rid of setlinestyle: transform code.Bastien Montagne
Note that I also made 'dash anchor point' consistent (the static one, not the mouse one), in previous code somtimes dashed were anchored to the static center point, in others, to the moving mouse position, the later was rather disturbing imho...
2017-04-15GPU Matrix API: clean up after 2D-3D unificationMike Erwin
See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API. - remove unused functions, defines, enums, comments - remove "3D" from function names - init to Identity transform (otherwise empty stack) - gpuMatrixReset lets outside code return to initial state Part of T49450 Follow up to D2626 and 49fc9cff3b90
2017-04-11Renaming: sl > scene_layerDalai Felinto
2017-04-11Bring snapping back (Base / BaseLegacy)Dalai Felinto
2017-04-08Correct constraint manipulator colorsCampbell Barton
Widget show as color of constrained axis
2017-04-07OpenGL: use PRIM instead of GL enum for immBeginMike Erwin
Getting ready for a Gawain API change... Part of T49043
2017-04-073D Manipulator: add back protected flags checkCampbell Barton
This used to be a separate pass
2017-04-073D View: manipulator from custom-manipulators branchCampbell Barton
Original code from @Severin with changes from @dfelinto & @hypersomniac. This doesn't cause many functional changes besides using new transform manipulators. Submitted as D2604
2017-04-07OpenGL: disable rotate manipulator clipping on MacMike Erwin
This fixes T51143. gl_ClipDistance is part of GLSL version 1.3 but Mac is stuck on 1.2 for now. This workaround uses GPU_SHADER_3D_UNIFORM_COLOR for the entire rotation widget, ignoring any clipping plane. The CLIPPING shader only works on GLSL 1.3+ so I removed its 1.2 cruft. A legacy implementation using gl_ClipVertex might be possible, but is not worth the effort. This problem (and workaround) goes away when all platforms move to 3.3 core profile.
2017-04-07fix rotation manipulator's Push/PopMatrix balanceMike Erwin
Was popping out the bottom of the stack.
2017-04-06Gawain: VertexFormat_add_attrib (function name change)Mike Erwin
See intern/gawain for the API change. Other files are updated to use the new name. Also updated every call site to the recommended style: unsigned int foo = VertexFormat_add_attrib(format, "foo", COMP_ ... )
2017-04-06Fix manipulator showing in pose & editmodeCampbell Barton
2017-04-06Merge branch 'master' into blender2.8Campbell Barton
2017-04-06Cleanup: function naming for manipulatorCampbell Barton
Rename 'stats_*' to 'protectflag_to_drawflags_*' (was too vague). Also remove NULL check from gimbal_axis
2017-04-06Merge branch 'master' into blender2.8Campbell Barton
2017-04-06Cleanup: minor changes to transform-manipulatorCampbell Barton
Match stats_editbone & stats_pchan behavior to avoid confusion.
2017-04-06Remove NULL check from gimbal_axisCampbell Barton
2017-04-05Cleanup: Move imm_draw utils into own fileCampbell Barton
These were in BIF_glutil which is documented to be removed, so best not define new API's there.
2017-04-05Fix rotation manipulators not clippingJulian Eisel
Added new shader for clipping, also cleaned up rotation manipulator drawing code a bit. This code should be replaced by new transform manipulators soon, just keeping this working in the meanwhile.
2017-04-03Merge branch 'master' into blender2.8Sergey Sharybin
2017-04-01Cleanup: styleCampbell Barton
2017-03-30Layers: Scene->basact > SceneLayer->basact (more work)Dalai Felinto
This brings back adding hooks among other areas
2017-03-30Prevent crash on weight paintDalai Felinto
Weight painting is still wrong, but it doesn't crash any more.
2017-03-29Base: update createTransObjectDalai Felinto
I was hoping this would fix the issue of the object not moving after you copy it (right now you need to manually grab the object afterwards). But unfortunatelly it does not
2017-03-23cleanup use of GPU matrix APIMike Erwin
Take advantage of 2D functions, rotation about the X Y or Z axis, uniform scale factors. We no longer need to call gpuMatrixBegin_legacy() before using the new API locally in functions. related to T49450
2017-03-22OpenGL: convert to new matrix API (part 5)Mike Erwin
Pretty sure source/blender is now finished, with all legacy matrix calls confined to gpu_matrix.c. This was the easy part, but doing it first makes the next part much easier. TODO and XXX notes describe what is left. glMatrixMode is still in place, since the new API does not share this concept of modes. Similar for glOrtho and glFrustum which I'll tackle very soon. Part of T49450
2017-03-21OpenGL: convert to new matrix API (part 4)Mike Erwin
Part of T49450, fixes a Push/Pop mismatch from part yesterday's 3.
2017-03-20Silence unused vars warningDalai Felinto
2017-03-15Remove commented out code from transform_snap.cDalai Felinto
Code was commented out in 2012 and it was not working even then. So it makes for an impossible conversion to the new gawain API.
2017-03-11Merge branch 'master' into blender2.8Campbell Barton
2017-03-11Cleanup: code style & cmakeCampbell Barton
2017-03-10Fix T47690: Connected PET w/ individual originsCampbell Barton
- Connectivity length was overwritten by distance to closest selected. - Vertices used the 'island' center of the closest vertex, even if it wasn't connected. Now optionally keep track of the original index of used as the closest connected distance. To support this needed to add optional support for islands of 1 vertex.
2017-03-09Merge branch 'master' into blender2.8Campbell Barton
2017-03-08OpenGL Select: integer rect for passing regionCampbell Barton
2017-03-07Once more T50565: Allow using planar constraints for scale manipulatorJulian Eisel
2017-03-02Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/blenkernel/intern/scene.c