Blender Git Commits

Merge branch 'master' into temp-ui-button-type-refactor

Add own button type for color buttons, don't using uiBut.a1/.a2 for them

Add own button type for progress-bar, don't using uiBut.a1 for progress

Merge branch 'master' into temp-ui-button-type-refactor

Fix missing NULL checks for buttons without layout

Merge branch 'master' into temp-ui-button-type-refactor

Store search item in search-button data, don't reuse general void pointer

Rather than re-using the `uiBut.func_arg2` pointer to reference the active
search item, have an own pointer for that in `uiButSearch`.

Unfortunately, we still need to pass the reference as `arg2` to the
`uiBut.func` callback. But we don't need to keep `uiBut.func_arg2` set the
entire time for that.

Remove unnecessary `uiButSearchData` struct

This doesn't add anything useful if we already have a struct for search
buttons. At the very least it should not be allocated.

Also uses clearer names for `uiButSearch` members.

Fixes for changes in master

Merge branch 'master' into temp-ui-cleanup

UI Code Quality: Use derived structs for search buttons and decorators

The current on-size-fits-all `uiBut` creates quite a mess, where it's hard to
reason about which members are free for use, under which conditions they are
used and how. This tries to untangle that mess.
A draw-back is that many casts have to be done although this seems reasonable.

(I don't expect an in-depth review, but would like to have the general design
change reviewed first.)

A complication was that we sometimes change the button type after it's created.
So I had to add logic to reallocate the button for use with the new, possibly
derived struct. Ideally that wouldn't be needed, but for now that's what we have.
This is also something I'd like to have reviewed.

Differential Revision: https://developer.blender.org/D7610

Add own derived struct for search buttons

A complication was that we sometimes change the button type after it's created.
So I had to add logic to reallocate the button if needed, so the derived data
can be used.