griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
75,692 Commits 1 Branch 0 Tags
ae1ba7679c0792361209da8e098b2c47dc60ff2b
Commit Graph

9428 Commits

Author SHA1 Message Date
Jeroen Bakker
baf0547de5 Workbench: Single Color Modes 
- ability to switch between Single Color, Object Color, Material Color
and Random Color
 - fixed Shading and Lighting popover
 - Renamed Solid -> Single Color
 2018-05-02 12:05:40 +02:00
Campbell Barton
85dcdb87d2 UI: fix operator redo showing empty popovers 
Many operators have no options,
showing a popover button with no content isn't good.
 2018-05-02 11:03:03 +02:00
Campbell Barton
c052346fbf UI: move object selector into 3D view 
This matches the new convention for left-handed mode selectors,
however we're still undecided on exactly how this should work.

For now test this out as a convention for all space types.
 2018-05-01 22:33:10 +02:00
Campbell Barton
52f1510613 UI: move space-mode selectors before menu items 
This adds a convention to have a spaces primary mode selector
positioned to at the left of the header.
 2018-05-01 18:56:52 +02:00
Campbell Barton
0636acc59a Icons: updated icons from @billreynish 
This adds vertex paint & sculpt icons + other minor changes.
 2018-05-01 16:52:12 +02:00
Jeroen Bakker
43452c254e Merge branch 'blender2.8' of git.blender.org:blender into blender2.8 2018-05-01 16:28:02 +02:00
Jeroen Bakker
be88f23b83 Overlay: Enabled wireframe drawing for vertex/weight paint 
This is a temp hack, so that billrey can use blender 2.8 for
drawing the icons. Hack will be phased out by T54910
 2018-05-01 16:26:31 +02:00
Campbell Barton
3f4a81232a UI: expose radial gradient as option 
Was a separate tool, use option so we can extend more easily.
 2018-05-01 12:48:35 +02:00
Campbell Barton
f38fbc9bed UI: add weight paint sample tools 
Also use unified weight.
 2018-05-01 12:20:53 +02:00
Jeroen Bakker
aad0e52e38 Workbench: Shading popover 
- Moved random object color and object outline to shading popover as
these are draw options.
 2018-05-01 10:43:27 +02:00
Campbell Barton
ed51b93bed Icons: write object children 
Allows for sharing geometry between icons.
 2018-05-01 08:40:07 +02:00
Campbell Barton
b93a76fe75 Add missing tools to vertex paint 2018-04-30 21:58:35 +02:00
Campbell Barton
a44d5b59d3 UI: order edit-mesh tools 
See T54885
 2018-04-30 20:40:36 +02:00
Campbell Barton
de1405949a UI: show topbar brush options w/ texture paint 2018-04-30 17:06:03 +02:00
Campbell Barton
3b9554ce9d UI: share common paint panels between all modes 2018-04-30 16:59:16 +02:00
Campbell Barton
7720525873 UI: add texture paint brushes to toolbar 2018-04-30 16:43:36 +02:00
Campbell Barton
9aef2d961d UI: add weight paint brushes to toolbar 2018-04-30 16:08:15 +02:00
Jeroen Bakker
cbe57acddf Workbench: Integration VertexPaint and WeightPaint modes 
- Disable VertexPaint and WeightPaint for OB_MATERIAL and OB_RENDER. Users want to see the final result
 - When in OB_SOLID, the active object should be rendered without any color. The lighting information is multiplied with the VertexPaint/WeightPaint color
 - Removed the use_shading flag from VertexPaint and WeightPaint
 - add method to check if render engine should draw without color (DRW_object_in_only_lighting_mode)

Reviewers: fclem

Tags: #code_quest

Maniphest Tasks: T54894

Differential Revision: https://developer.blender.org/D3191
 2018-04-30 15:54:38 +02:00
Campbell Barton
d9f395ac39 UI: add vertex paint tools 
Generalize logic to show the paintbrush as a tool so
different paint modes can use it.
 2018-04-30 15:23:04 +02:00
Joshua Leung
05cf7863c3 Fix: UI layout for "Pause" button on timeline header was broken (leaving a gap) 
A recent change in the UI layout code probably broke how the scale_x
for layouts was getting handled. This was leaving a large gap
(and causing layouts to pop) when trying to scrub the timeline.

This commit fixes this with a manually-found value that largely seems
to get rid of the popping problem. There's still a little jumping (1-2 px)
but it's less distracting now.
 2018-04-30 15:11:43 +02:00
Campbell Barton
78f13ee46c UI: use "none" icon if loading fails 
Workaround for issues w/ two column layout when icons are missing.

Also fix reloading icons when some values aren't valid.
 2018-04-30 13:57:47 +02:00
Campbell Barton
005711ffef Fix sculpt ToolDef generation 
With non-default sculpt brushes, tool generation could fail.
 2018-04-30 13:46:01 +02:00
Campbell Barton
ea2146c3e1 Correct error in toolbar update 2018-04-30 12:46:23 +02:00
Campbell Barton
f4697b392d Tool System: change internal definitions (again) 
Was using classes to define tools, however this makes it awkward to
dynamically generate them (we can do it, but its not very "Pythonic").

Move to a named tuple.
 2018-04-30 12:14:46 +02:00
Jeroen Bakker
cb37080627 Topbar: Enable Vertex Paint tools 
Discussed with Campbell just to use the .dummy for now.
 2018-04-30 10:40:54 +02:00
Campbell Barton
4218a94b1e UI: disable top-bar tool name drawing 
Makes text jump about.
 2018-04-29 18:03:01 +02:00
Campbell Barton
b5985831e2 UI: show add/subtract as icons 
Saves space in the topbar
 2018-04-29 17:38:17 +02:00
Campbell Barton
5cdeae2105 UI: show basic sculpt options in topbar 2018-04-29 17:33:08 +02:00
Campbell Barton
e84735de45 Cleanup: rename snake_hook 2018-04-29 17:08:24 +02:00
Campbell Barton
60ce3275c1 UI: use sculpt icons in the toolbar 2018-04-29 17:01:10 +02:00
Campbell Barton
7c3a028e85 UI: new sculpt icons from @billraynish 2018-04-29 17:00:46 +02:00
Campbell Barton
79638c5c30 UI: backface cull generated icons 
Allows for keeping icons 3D without adding extra geometry at export.
 2018-04-29 16:51:15 +02:00
Campbell Barton
695326eb8f UI: remove toolbar separator between categories 
Made cursor split from selection tools, giving ugly 2 column layout.
 2018-04-29 16:49:24 +02:00
Campbell Barton
65d78f4695 UI: group sculpt brushes in the toolbar 
All sculpt brushes are accessible from the toolbar, grouped by type
to keep the toolbar a fixed size.
 2018-04-29 16:36:31 +02:00
Campbell Barton
6f544f635b UI: fix toolbar groups w/ data_blocks 2018-04-29 16:24:40 +02:00
Campbell Barton
8c4ff84ed6 UI: hide sculpt panels from toolbar 
These are already available from the topbar.
 2018-04-29 16:22:40 +02:00
Campbell Barton
76282a986d UI: initial dynamically generated sculpt tools 
Lots more work needed, this just lists sculpt tools in the toolbar.
 2018-04-29 14:31:00 +02:00
Campbell Barton
6e76a35f07 Tool System: support data-blocks in tools 
Needed so tools can set the active brush.
 2018-04-29 14:30:09 +02:00
Campbell Barton
f4ba7667dc UI: support tool generators (no visible change) 
This allows toolbar definitions to dynamically generate tools,
needed for generating a tool list from brushes for eg.
 2018-04-29 12:28:21 +02:00
Brecht Van Lommel
e017876f78 3D View: add initial view.shading and view.overlay in RNA. 
These are mostly empty still, many properties need to be renamed and moved there.
 2018-04-29 09:55:47 +02:00
Brecht Van Lommel
03957b9487 3D View: move shading and overlay settings into popovers. 
* This is just moving buttons to get a bit closer to the intended design,
  better naming and layout is needed.
* Popovers currently work best when the 3D view header is at the top, with
  the most important settings nearest to the mouse. Open design question is
  if we should flip (part of) the buttons if header is at the bottom.
* Another question is if selecintg a shading mode enum should immediately
  close the popover since those are changed often, unlike the other settings
  for which it seems more convenient to keep the popover open.
 2018-04-29 09:22:00 +02:00
Brecht Van Lommel
cb53c9bc7b Fix use of removed Blender Internal properties. 2018-04-29 09:18:54 +02:00
Brecht Van Lommel
ca7964c24b UI: fix toolbar not snapping properly with system DPI and display scale. 2018-04-28 20:50:47 +02:00
Brecht Van Lommel
61759f3b55 Cleanup: remove code for removed Blender Internal properties. 2018-04-28 16:15:42 +02:00
Campbell Barton
a74097dc19 UI: Add icon color saturation preference 
Toolbar icon saturation can now be set from the preferences,
(use 0.4 by default).
 2018-04-28 13:34:52 +02:00
Campbell Barton
e1417c665d UI: split toolbar layout from button creation 
Having single & multi-column checks inline were becoming unmanageable.

Use a generator to define the layout,
allows for easily adding different layouts in the future.
 2018-04-28 11:42:53 +02:00
Brecht Van Lommel
a593cc046c UI: put active tool buttons in center topbar region. 2018-04-28 10:42:58 +02:00
Campbell Barton
cfa1700792 UI: add loopcut & edge offset tools 
Also fix minor layout bug.
 2018-04-27 23:08:25 +02:00
Campbell Barton
c42a47d177 UI: add new transform tool that enables all widgets 
Also add bevel tool.
 2018-04-27 22:49:52 +02:00
Campbell Barton
e724238457 Tool System: use release_confirm for extrude 2018-04-27 20:43:41 +02:00