Blender Git Loki

Merge branch 'wiggly-widgets' into gooseberry

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_object.c

Move priority of widget handler back for node editor. Still not very
clean but should allow gooseberrians to work a little better

Initialize dropboxes and widgets together before opening the homefile,
makes sure areas get their proper handlers registered

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesrna/intern/rna_object.c

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/sequencer.c
source/blender/imbuf/intern/anim_movie.c

Possibly dangerous feature - don't scale images if they come from a
proxy.

Sequencer: Implement priority queue based on frame number instead of
memory size (Thanks to sergey for suggestion)

New space enum option for the particle instance modifier, to chose which
space the particle data should be interpreted in.

By default the space will now be `Local`, meaning that copies of the
mesh are made with the offset of the respective particle in the particle
object's local space, rather than using the world space offset of the
particle //inside the modified object space//. This behavior is much
more intuitive and consistent with true duplicators, such as face duplis.
Old files will still have `World` setting, so existing blend files are
not changed.

Better implementation for cache disable - do not store or retrieve cache
ever if debug value is 314

Merge branch 'master' into gooseberry

Disable sequencer preprocess cache if 314 debug value is set

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/image.c

More roughness options for offsetting child clumping.

This is obviously total madness, this feature is totally unusable when
the coder is not sitting next to you ... But so are the rest of particle
settings, the only solution is a future node system.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Fix for unfreed effector weights in hair dynamics.

The internal cloth modifier effector weights get replaced temporarily
to make the cloth sim use the particle weight settings instead. But
the particle sim was not putting back the original weights, which can be
non-NULL in case the cloth sim allocated these already. Messy design ...

Fix for unfreed memory due to unnecessary early exit in the free
function.

Fix for unfreed memory of internal hair cloth modifier pointcache.

Cleanup: Moved particle interpolation code into own file.

Merge branch 'master' into gooseberry