Blender Git Commits

fix mismatched memory free

This string is copied with strdup during GPUx_specify_attrib, needs a
plain free.

new function: bind all attrib locations

Was binding these by hand in wireframe shader tests, but retyping the
name strings is a potential source of errors. Call this function instead
after creating VertexBuffer but before linking the GLSL program.

Zoom to frame options, requested by the Hwoozeberry (dutch translation)
team.

There are 3 options here:

1) Keep range (previous behaviour)
2) Seconds - allows a specified offset in seconds around current frame
3) keyframes - zoom to include a number of keyframes around the cursor

Options 2 and 3 have their own properties to tweak the behaviour and all
options can be found in User Preferences->Interface under the 2D
viewports section.

Number 3 will probably need some refinement so commiting here for the
hwoozeberry team to test first.

Fix for previous commit: the "goal deflect" feature wasn't actually
filtering effectors by type.

Revert "Squashed commit of asset-experiments branch."

This reverts commit 41e471dca4a195e703cf1d21bf4c1e7a92ef46a4.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'master' into asset-experiments

Fix crash in append/link on windows (sigh).

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp

Optional feature "Goal Deflect" to disable goal forces when hitting a
deflector object.

Fix newly created dir not going into rename state anymore.

Due to async dir listing...

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Revert "Add missing stubs for buffer generation."

This reverts commit 4040f0af0017409fad4912605527900ba6919173.

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/blenkernel/CMakeLists.txt

Restore drag'n'drop from filebrowser.

We need to store non-static data here, so had to tweak drag and drop button code...

Some cleanup and reducing diff from master.

Merge branch 'master' into cycles_kernel_split

Cycles kernel split : Fix object_dir_transform -> object_normal_transform