Blender Git Commits

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_blender_version.h

Merge branch 'master' into wiggly-widgets

Conflicts:
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/startup/bl_ui/properties_data_bone.py
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'master' into wiggly-widgets

Conflicts:
intern/cycles/blender/addon/ui.py
source/blender/editors/transform/transform_manipulator.c

Merge branch 'master' into wiggly-widgets

Did some further edits on related changes.

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/math_vector.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_transform.h
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/space_sequencer.c

Enable continuous grab for widget tweaking

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Register widget group types more like operator types

Is more consistent and I think it makes it easier to understand the role of widget groups.

Adds file space_node/node_widgets.c

Fix widget tweaking undo after latest changes

Property pointers are invalid after undo, so we need to set them again on widget-map refresh. Would be nicer if widget code could handle this behind the scenes, so the property only had to be set on _init, but for now this is sufficient.

Rewrite Widget Update->Draw Routine (Massive Performance Boost)

This commit merges work done in temp_widgets_update_tagging branch into wiggly-widgets branch. It gives a speedup of up to ~500x (yes, 50,000%!) for simple view navigation in my benchmarks (more detailed results below).

Instead of re-creating all widgets on each redraw (like we do it for buttons), we now keep widgets and do some more advanced updating instead.
The widget-map update routine is now split into three steps:
* init - Initialize widget groups, only done once.
* refresh - Refresh data of widget groups, only if widget-map has been explicitly tagged for update by calling WM_widgetmap_tag_refresh.
* draw_prepare - Stuff that needs to be done on every redraw (currently used by 3D transform manipulator).

Also contains some unrelated cleanup.

Benchmark results:
The numbers below are average results, I repeated all tests multiple times while tying to keep conditions as similar as possible. I measured the time needed update and draw the widget map.
We have to distinguish between a simple redraw which leaves widget data mostly untouched and a data refresh. To trigger a simple redraw I rotated the view, for triggering data refreshes I continuously toggled selection.

1. Default .blend, 3 objects, transform manipulator
-- Simple redraw: ~4.5x speedup (0.00009 vs. 0.000020 sec.)
-- Data refresh: ~1.6x speedup (0.000033 vs. 0.000021 sec.)

2. Frank pose mode, 9 face map widgets + transform manipulator
-- Simple redraw: ~420x speedup (0.0231 vs. 0.000055 sec.)
-- Data refresh: ~2x speedup (0.014834 vs. 0.007417 sec.)

3. Caminandes island mesh, 197,151 verts, transform manipulator
-- Simple redraw: ~500x speedup (0.011596 vs. 0.000023 sec.)
-- Data refresh: Only ~1.05x speedup (0.009376 vs. 0.008970 sec.)

Merge branch 'master' into wiggly-widgets

Conflicts:
release/scripts/startup/bl_ui/properties_data_bone.py
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_armature_types.h

Add/use typedefs for function pointers

Fix DNA alignment error on 32 bit systems

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/include/BIF_glutil.h
source/blender/editors/screen/glutil.c
source/blender/editors/space_image/image_draw.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_edit.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/space_sequencer/sequencer_ops.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/space_graph/graph_ops.c

Merge branch 'master' into wiggly-widgets

Cleanup: Variable naming

Transform Manipulator: Rotation indicator (arc overlay)

Adds a arc shaped overlay indicating the current rotation value for the rotation transform manipulator.

This is still ignoring constraints, which can be fixed by calculating angle using object matrices instead of cursor position.
Seems like we could also use BLI_dial_angle here, but will check on that at some other point.
Visual design is a subject to change of course. Will add screenshots to T47032.