Blender Git Commits

Merge branch 'master' into wiggly-widgets

New, not so chunky arrow widget drawing

We're now using immediate drawing for arrow widgets instead of using the arrays created using the widget export script.

Although this also includes a thinner arrow generated using the export script, I decided to not use it for now, as the thin lines are drawn a bit ugly. I just #ifdef'ed it out.

Minor tweaks to 3D widget colors

Fix manipulator mouse hover highlighting (Finally! o/)

Issue already existed since rB4ee1de8c3ce6e, used fallback to old manipulator handling since then.

Issue was that we weren't able do identify the highlighted widget after freeing and reinitializing the widget group (as it happens on each redraw). widgets_compare checked the property assigned to the widgets, but since the manipulator widgets trigger operators instead of tweaking a property, it never returned the right result.

Now, instead of comparing widget properties, we use a widget id-name that is unique within it's widget group (see rB3b42468bff06d2).

Hrmpf, and I spent countless hours debugging widget initialization and OGL selection :S

Register each widget with a unique id-name

Needed so we can reliably compare widgets after freeing (for next commit).

Don't pass hidden widgets to selection queries

Also minor cleanup.

Corrections to previous commit

Cleanup: Naming, no need to use widgetgroup->customdata

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

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

Allow rotate manipulator to use zoom independent scale as well

Only draw leftovers of old manipulator widget if debug_value != 0

Good to keep this as reference.

Minor Cleanup

Fix wrongly scaled arrow widgets while zooming

View matrix needs to be updated before using it (always used matrix from last redraw)

Painfully merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesdna/DNA_armature_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_clip/clip_draw.c
source/blender/gpu/GPU_buffers.h

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/object/object_ops.c

Merge branch 'master' into wiggly-widgets

Cleanup: Whitespace, Warnings, etc.

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_edit.c