Blender Git Commits

Merge branch 'viewport_experiments' into gooseberry

Conflicts:
source/blender/gpu/intern/gpu_buffers.c

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c

Revert "Hook up flags to request a specific sorting scheme from GPU buffer setup"

This reverts commit 827ad6075dcf144025db7c4319e9954dcf45b26c.

Merge branch 'master' into gooseberry

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

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Merge branch 'master' into viewport_experiments

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_preview.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_space.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ops.c

Fix compilation error with SCons

The file wasn't being comiling by CMake, remove it from SCons compilation as well.
Not sure if the same is required in original branch, maybe it'll be redone anyway.

For now let's make it so gooseberry branch is compiling nicely on the buildbot.

Cage widget now does something useful (tm). Basically, we can now
transform the x direction of the backdrop in sequencer when a viewer
node is active.

There are still some issues with property transform not being a proper
operator, but we can fix that easily.

To make full 2D transform work we need positions stored in one property.

2D widgets Cleanup:

* Get rid of invalid flag (we avoid drawing widgets by dereferencing RNA
now so it should be OK)

* Add intersect function for 2D widgets (still needs correct mapping to
be any useful though)

Correctly center the widget in node space

Merge branch 'master' into gooseberry

Merge branch 'wiggly-widgets' into gooseberry

Cage actually now draws something, also change widget, will be modified
to control placement of backdrop.

Better update function for particle settings affecting nested cloth
modifier.

Fix for invalid particle pointer access in mixed particle/child loop.