Blender Git Commits

Integration of particle shapekeys with the depsgraph and driver eval.

It's a bit messy, but that is to be expected: all of the areas involved
(particles, shapekeys, depsgraph, drivers) are badly designed and
supposed to get major refactoring ...

Fix ImBuf memory leak in Ptex

Merge remote-tracking branch 'origin/master' into cycles-ptex-49

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h

Ptex+OSL compilation fix, change ifdef guard for older Ptex code

Merge remote-tracking branch 'origin/master' into cycles-ptex-49

Merge branch 'master' into asset-experiments

Use the X mirror option in new strand edit stroke brush tools.

Note that currently this has virtually no effect, because the mirror
option relies on exact positions of vertices, which does not happen with
random hair placement (the add brush has no mirror option yet).

Eventually topological mirroring should help with this case, but is not
implemented for either old or new strand edit yet.

Cleanup: rename function argument for consistency.

Merge branch 'master' into asset-experiments

Select new layer after importing a Ptex layer

Set "*.ptx" filter glob for Ptex import operator

Use filename as the new layer name in Ptex import operator

Add Ptex extension (ptx) to imb_ext_image array

Also hid ptx extension behind WITH_PTEX ifdefs

Use file browser instead of hardcoded path in Ptex import operator

Ptex: fix memory leak from subsurf cache

Ptex SCons include tweaks

Make default Ptex layer a better color than flat black

Fix crash in Ptex+Cycles

- Fix name of CMake option

- Fix path in BPX include

Ptex+Cuda: update the svm_image_texture switch