Blender Git Loki

Cleanup.

A simple utility class to time functions.

Export UI: forgot to remove those in a previous commit.

Fix compile error (tm).

OpenVDBReader: small de-duplication.

OpenSubdiv: Minor cleanup

OpenSubdiv: Make sure tabs are used for indentation

OpenSubdiv: Fix some bad array subscriptions in drawing code

OpenSubdiv: Can't really avoid passing subdiv level to GL mesh construction

Topology is not refined at that point yet and does not contain any information
about subdivision level.

Merge branch 'master' into opensubdiv-modifier

New widget types for drawing scrollbars using widget pipeline

Had to add UI_WTYPE_SCROLL_BACK and UI_WTYPE_SCROLL_INNER since they need different rectangles, drawing and states. Also renamed UI_WTYPE_SCROLL to UI_WTYPE_LISTSCROLL as it's only used for lists.

Cleanup: Naming, comments, redundant defines, ...

Cleanup: Move widget_type function to widgets.c and widget type enum to widget.h

And suddenly, things are soooo much nicer ;)

Merge branch 'master' into temp-ui-widget-refactor

New widget type for preview menu items

Also to avoid special draw calls.

Note: This adds iconid and str args to uiWidgetDrawType->text callback, which is currently only needed for preview menu items (could also be done differently), but in future this might be handy to get rid of uiBut usage on this level.

Merge branch 'master' into missing-libs

Avoid special drawing calls for labels within menus by adding a widget type for them

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c

Merge branch 'master' into asset-experiments

Aaaand finally: Use new pipeline for text drawing as well