Blender Git Loki

Bring back __tex_image_150 on DingTo's advice

Potential Ptex+Cuda fix, adjust number of GPU texture slots

Ptex+Cuda fix, use kernel_assert instead of assert

Minor TODO fix, rename PtexDataType -> MPtexDataType

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

Ptex+Cuda compilation fix

Improve performance of mesh iteration in ptex_pack_loops

Add missing OIIO include dirs for CMake in extern/ptex

Naming cleanup: better consistency in extern/ptex

Minor includes cleanup in bke_ptex.c

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

Move some of the Ptex code behind a WITH_PTEX ifdef

Can be set via WITH_PTEX in CMake or WITH_BF_PTEX in SCons.

Not well tested yet.

Minor code cleanups for Ptex

Minor code cleanups for Ptex

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

Fix linker error in blenderplayer

Added extern_ptex to list of link libraries.

Compilation fix for game engine

Added null parameter to GPU_material_bind.

Utility methods for mirrored strand editing.

These are a modified version of their BMEditMesh counterparts.

use_topology is not yet implemented for strands. Native strand topology
is not very useful for this. Instead, the topology of the scalp mesh
should be used for finding mirrored strand roots, then the arc- or
parametric length of a vertex from the root to find mirrored verts.

Merge branch 'gooseberry' into strand_editmode

Conflicts:
source/blender/makesdna/DNA_customdata_types.h

fix: crasher when appending object with modifier and when trying to remove rigidbody traces when no rigidbody world is available