f228a08d02
merge from master
2018-02-26 22:49:30 +01:00
ec27281812
Fix incorrect text clipping on node link button in material properties.
2018-02-25 19:57:40 +01:00
618bc6c679
GPU: use alpha blend that works for drawing to transparent buffer.
...
It's unlikely to ever be intentional to square the source alpha, as happens
with glBlendFunc, so this changes the blending throughout the code.
2018-02-14 14:00:57 +01:00
9c91c75ea6
Merge branch 'master' into blender2.8
2018-01-11 13:24:41 +11:00
9d62e6e782
UI: don't draw outline when it's not calculated
...
Outline drawing was running even when there were no verts to draw.
Causes an assert in 2.8.
2018-01-11 13:23:55 +11:00
e36b5f004d
ID Static Override: add basic UI feedback.
...
For now, using a new color for overridden properties (similar to
animated/driven status), UI team will need to work on a better solution
maybe...
2017-11-29 17:23:25 +01:00
d4fe083b35
Merge branch 'master' into blender2.8
2017-11-04 21:45:52 +11:00
25f56d7a7b
UI: correct flag re-use
...
Adding ability to show a button as pressed w/o UI_SELECT set caused
other flags to be cleared that shouldn't have been.
2017-11-04 14:13:04 +11:00
c1da6c9d7d
Merge branch 'master' into blender2.8
2017-11-03 01:16:10 +11:00
25f2abf314
Cleanup: minor comment correction
2017-11-03 01:10:03 +11:00
9ece0ee5fe
UI: add UI_SELECT_DRAW flag
...
Allow to draw as pressed w/o interfering with behavior.
Resolves issue where buttons raised on mouse-over.
2017-11-03 00:47:51 +11:00
7eb4ef6cac
Merge branch 'master' into blender2.8
2017-11-03 00:31:47 +11:00
6355d98267
UI: free up bit in uiBut.flag
2017-11-03 00:27:29 +11:00
4a85089abe
Merge branch 'master' into blender2.8
2017-11-02 15:45:19 +11:00
88356a2442
Cleanup: use term shape-preset in widget code
2017-11-02 05:48:59 +11:00
3ec4d0b51b
UI: Add UILayout.operator_menu_hold
...
This is an operator button that opens a menu when the button is held.
2017-11-02 05:01:10 +11:00
63dfb5bb97
Cleanup: naming (GPU immediate util)
2017-09-26 15:21:01 +10:00
6d359e4498
Cleanup: use explicit 2d suffix for imm utils
...
Avoid ambiguity between 2d/3d (which were already named).
2017-09-14 01:24:50 +10:00
c72eb6288e
Fix Label colors in popups
2017-07-27 12:28:16 +02:00
ec22809025
Fix Label colors in popups
2017-07-27 10:27:29 +03:00
b4d053efc7
Gawain API naming refactor
...
Use consistent prefix for gawain API names as well as
some abbreviations to avoid over-long names, see: D2678
2017-06-19 20:18:04 +10:00
af61b5eb0c
cleanup use of immUniformColor
...
- use best function for the job
- don't specify alpha if 100%
- 'f' for floating point literals
2017-04-16 13:44:34 -04:00
bd3a1b9490
OpenGL: use PRIM instead of GL enum for immBegin
...
Getting ready for a Gawain API change...
Part of T49043
2017-04-07 16:31:26 -04:00
f69678482c
OpenGL: refactor UI_draw_roundbox functions
...
Each function takes a bool (filled vs outline) and a color. We already had multiple ways of passing color in; these are still here. Special variant for anti-aliasing.
- took GLenum out of interface
- removed UI_RB_ALPHA flag (only one place really used it)
- use exact vertex count
- removed redundant state changes (BLEND, LINE_SMOOTH)
2017-04-06 19:15:26 -04:00
0debbe2b7f
Gawain: VertexFormat_add_attrib (function name change)
...
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-06 01:18:12 -04:00
2f700b8280
GPU_immediate_util: missed last commit
2017-04-05 18:53:34 +10:00
a4fac21fc5
Cleanup: Move imm_draw utils into own file
...
These were in BIF_glutil which is documented to be removed,
so best not define new API's there.
2017-04-05 18:43:59 +10:00
4dadb6d445
Naming constancy for 'imm' utility functions
...
- use 'imm_draw_' prefix for functions that draw.
- use '_3d' suffix for 3d functions, no suffix for 2d functions.
- use terms fill/wire (shorter than filled / lined).
Also add `imm_draw_circle_fill_3d` (only had wire version)
2017-04-05 17:46:25 +10:00
Julian Eisel
ff3e1fa760
Merge branch 'master' into blender2.8
2017-03-28 23:11:10 +02:00
59bb4ca1b0
Fix: Icon offset for pie buttons
2017-03-28 13:44:02 +03:00
09ad684249
cleanup use of GPU matrix API
...
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-23 01:46:14 -04:00
938613f720
OpenGL: convert to new matrix API (part 1 of x)
...
Part of T49450
For this batch I focused on usage of (now-obsolete) macros in BIF_gl.h
2017-03-21 00:09:40 -04:00
Julian Eisel
2977a8cd21
Add tabs as standard button types
...
NOTE: This is really a backend-only implementation, nothing is changed in the UI
Adds a tab button-type and the basic drawing and handling code for it.
More work needs to be done on it, but idea is to get in ready for usage in the
topbar.
Differential Revision: https://developer.blender.org/D1371
2017-03-17 17:10:05 +01:00
Julian Eisel
a96008f3aa
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
2017-03-17 15:38:45 +01:00
9d873fc3de
Various icon adjustments
2017-03-17 16:57:53 +03:00
4dacda58f9
Merge branch 'master' into blender2.8
2017-03-13 07:51:10 +11:00
76015f98ae
Fix icon alignment for pie buttons
2017-03-11 22:34:09 +03:00
fbb1b311ea
Merge branch 'master' into blender2.8
2017-03-12 03:00:06 +11:00
f667593b6a
Fix text and icon positioning issue on high DPI, after recent changes in 32c5f3d.
2017-03-11 04:47:22 +01:00
8901263b5f
Merge branch 'master' into blender2.8
2017-03-02 00:22:13 +11:00
32c5f3d772
Fix text and icon positioning issues
2017-03-01 16:11:21 +03:00
Julian Eisel
20a105d54c
Fix errors in new immediate mode for interface_widgets.c
...
Text editing cursor, text editing selection highlights and pie menu
direction indicator weren't visible.
Caused by rB4f2375b82f72.
2017-02-26 16:53:04 +01:00
3b3ed19c18
OpenGl immediate mode: remove imm_draw_line
...
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-23 03:21:58 -03:00
Julian Eisel
9c106ff211
Cleanup: Style
2017-02-22 18:54:56 +01:00
4f2375b82f
OpenGL immediate mode: interface_widgets.c
...
Added rgba_float_args_set_ch to BLI_math_color.h
2017-02-20 21:21:47 +01:00
322b1d3187
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/animation/anim_draw.c
2017-02-17 20:03:55 +01:00
Dalai Felinto
574d6011f4
Revert "Collection Editor based on patch by Julian Eisel"
...
This reverts commit 3da834e83c
2017-02-15 18:17:34 +01:00
Dalai Felinto
6906a884ee
Immediate Mode: make triangles smooth again
...
Instead of bothering with matrix transformations, I am simply adding the jitter to the vertices.
Related to: rB31a21135cf72c8623be7f5aee2bfdac983ceae2e
2017-02-14 14:35:18 +01:00
Dalai Felinto
31a21135cf
Immediate Mode: area.c and UI_draw_icon_tri, ui_draw_anti_tria
...
Note: This makes the jittering to not work :/
@merwin, would you know how to use gpuMatrixBegin2D for this case? I
think it must be the reason behind the lack of jittering. But I couldn't
get it to work (the 2D shader is asking for a 3D Matrix).
Part of T49043
2017-02-14 13:02:58 +01:00
Julian Eisel
4b365064cf
Remove most (maybe all?) remaining yellow text
...
Decided to request the text color as argument for UI_fonstyle_draw
functions, rather than keeping it being another state to keep track of.
2017-02-10 00:17:50 +01:00
