Blender Git Commits

Merge branch 'master' into temp_localview_split

Update comment

Fix viewport not updating layers when changing out of local view

Some more tweaks for local view checks

Add security check for View3D.lay behavior

add region free function

fix region data free error

remove debug info of last commit

fix bug in chaning mode

- error: when 'tracking' mode is clicked, it also enter into 'correspondence' mode.
the if-else logic was wrong

Merge branch 'master' into soc-2016-multiview

Switch combing tool back to using vertex displacement rather than edge rotation (tentatively).

This method is more straightforward and easier to predict when testing constraint solving.

More checks for new local view

implemented brush normal based splash prevention

VSE sound strips: draw either the waveform or text label, not both.

Drawing both text and the wave onto a sound strip makes both hard to read,
which is a concrete issue for Hjalti at the moment. This was the simplest
fix I could think of to give him control over what he sees.

Merge branch 'master' into soc-2016-pbvh-painting

Merge branch 'master' into soc-2016-pbvh-painting

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Packing: Support for margin

hiding fft noise type from gui: currently not supported in mantaflow

Use inline functions instead of macros for local view utilities

Move local view macros into own file (BKE_localview.h)