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-05-25TexFace removal part 3Campbell Barton
- MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-09glPushAttrib/Pop change implementation to use a stackDalai Felinto
The original implementation (cbd78c81268f) broke depth of field.
2017-05-05Update paint wire when changing modesLuca Rood
2017-05-04Vertex paint with draw managerLuca Rood
Reviewers: fclem Subscribers: campbellbarton, dfelinto Differential Revision: https://developer.blender.org/D2658
2017-05-04Remove visibility check for project paintCampbell Barton
This is such a corner case, and currently there is no way to paint on a hidden object, removing.
2017-05-03Fix projection paint initialization failingCampbell Barton
2017-05-03Weight painting with draw managerLuca Rood
This implements weight rendering with the draw manager, with all drawing options (Shading, wire, face masking, vertex masking). This is part of T51208 Reviewers: campbellbarton Subscribers: dfelinto Differential Revision: https://developer.blender.org/D2654
2017-05-02Cleanup: use depsgraph for scene/layer accessCampbell Barton
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-26Getting rid of setlinestyle: Paint 'line' strokes.Bastien Montagne
2017-04-26Pass graph to depth functionsCampbell Barton
2017-04-19Fix alpha overlay for sculpt/paint when using core profileSergey Sharybin
Same fundamental problem as fonts -- there is no longer GL_ALPHA format.
2017-04-19Remove basic shader from paint cursor overlaySergey Sharybin
Immediate mode built-in shader is used for this drawing already. So there is no reason to try building basic shader which is not supported in the core profile.
2017-04-19Use model view matrix instead of texture matrix for texture brush overlaySergey Sharybin
It is required for our new matrix stack to only have projection and model view matrix modes. This commit ports paint cursor overlay to model view matrix.
2017-04-16use immUniformColor instead of immUniform("color"Mike Erwin
The specialized color functions are better in every way: - faster lookup (don't have to match "color" string) - flexible inputs (RGB with separate alpha) - automatic alpha = 1.0 if not specified Sort of related to T49043
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-07OpenGL: use PRIM instead of GL enum for immBeginMike Erwin
Getting ready for a Gawain API change... Part of T49043
2017-04-07OpenGL: transition away from GL_QUADSMike Erwin
Single quads are drawn as a TRIANGLE_FAN, with 4 verts in the same order. Multiple quads now use PRIM_QUADS_XXX and will need further work. Only 8 places still use this. Part of T49043
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-05Paint cursor changes, so it save/load only the required flagsDalai Felinto
2017-04-05GPU_immediate_util: missed last commitCampbell 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-03-30Prevent crash on weight paintDalai Felinto
Weight painting is still wrong, but it doesn't crash any more.
2017-03-27OpenGL: use old API for texture matrixMike Erwin
New matrix API does not support texture matrices. Not sure what the final code will look like, but this at least avoids interference with new ModelView matrix. Marked each line with TEXTURE so they can be disregarded during searches. Related to T49450
2017-03-23OpenGL: `paint_cursor` port to immediate mode (Part 2)Germano Cavalcante
Part of T49043
2017-03-23OpenGL: `paint_cursor` port to immediate mode (Part 1)Germano Cavalcante
Part of T49043
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 1 of x)Mike Erwin
Part of T49450 For this batch I focused on usage of (now-obsolete) macros in BIF_gl.h
2017-03-04OpenGL: paint_draw_cursor with new imm modeMike Erwin
Part of T49043. This was the last use of glutil_draw_lined_arc. Plenty more to do in this file, I'll keep working on it...
2017-03-03Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/armature/pose_select.c source/blender/editors/include/ED_armature.h
2017-03-03When creating texture/image in Texture Paint mode, both datablocks should ↵Bastien Montagne
get the same name The paint slot name was not the same as what is displayed on the texture properties panel. Instead, the slot type (e.g. "Diffuse Color") was used as the name. Patch by Suchaaver (@minifigmaster125) with minor changes from @mont29. Reviewers: mont29, sergey Maniphest Tasks: T50704 Differential Revision: https://developer.blender.org/D2523
2017-03-02Remove all instances of OBACT from drawobject.c and related changesDalai Felinto
2017-03-02Remove tons of OBACTDalai Felinto
There are now only referenced in: * drawobject.c * particle_edit.c * space_image.c (a single case to be handled on workspace branch) * rigidbody_constraint.c (to be handled in the following commit)
2017-02-27Merge branch 'master' into blender2.8Luca Rood
2017-02-27Fix/workaround T50677: Shrinkwrap constraint don't get updated when target ↵Sergey Sharybin
mesh gets modified Do a "full" update on leaving sculpt mode, so we are sure scene will be brought to a consistent state. Ideally we'll only do that when there are objects which depends on geometry without re-calculating self geometry, but that's a bit tricky currently.
2017-02-26OpenGL: replace gluProject and gluUnProject, and simplify surrounding code.Brecht Van Lommel
Part of T49042.
2017-02-23OpenGl immediate mode: remove imm_draw_lineLuca Rood
Replaced all calls to `imm_draw_line` by plain `immVertex2f` calls, and removed `imm_draw_line`, as that function was not supposed to exist in the first place, and causes unnecessary calls to `immBegin`/`immEnd`. Part of T49043
2017-02-22Cleanup: StyleJulian Eisel
2017-02-22OpenGL immediate mode: paint_stroke.cClément Foucault
2017-02-17blender2.8: New immediate mode for sculpt_uv.cTCMBoby
[Note: this patch functionality was implemented in parallel, independently at bf83f097ad7e That said, the original patch was also removing an unnecessary include, so here it is] Replaced the one call to `glutil_draw_lined_arc`. This seems to be the only draw call in this file. Reviewers: merwin Tags: #bf_blender_2.8 Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2497
2017-02-15Immediate Mode: sculpt_uv.cDalai Felinto
2017-02-15Fix sculpt brush draw crash on Blender2.8Dalai Felinto
Temporary solution by Sergey Sharybin, it needs further investigation. This should not be necessary, specially since this works fine in master.
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-16Cleanup/refactor: move BKE_deform_flip_side_name & co to BLI_string_utilsBastien Montagne
Functions like that do not have anything to do in BKE really, even less when actually more used for bones than vgroups!
2017-01-16Cleanup/refactor: get rid of fixed name limit in BKE_deform_flip_side_name & co.Bastien Montagne
Those were forcing to use vgroup name define in bones area, or even mixing with maxbonename... ugly, and totally avoidable.
2017-01-12Merge branch 'master' into blender2.8Bastien Montagne
2017-01-12Fix T50056: Dyntopo brush size shortcut broken using constant detail setting.Julian Eisel
2016-12-28Revert particle system and point cache removal in blender2.8 branch.Lukas Tönne
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
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