Blender Git Loki

fix: added cluster_group to presets

fix: clustergroup centroid search didnt take obmat into account

Merge branch 'master' into gooseberry

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Cleanup

Temporary hack to ensure packed image pointer

Hacky fix for saving texpaint ptex changes

Add initial Ptex support to texture paint mode

Allow ptex node to be a texpaint slot

Add Ptex to mesh-data UI

Add Ptex mesh operators

- Add Ptex layer

- Remove Ptex layer

- Halve/double resolution of selected faces

- Import Ptex data into a new layer (TODO, should open a file browser
but for now it's hardcoded to a path on my machine)

Update Blend file saving/loading for Ptex

Add Ptex UV interpolation to subsurf modifier

Add Ptex support to Cycles image node, also add Ptex node

Add Ptex shader node

Add support for GPU drawing of Ptex textures to image node

Add Ptex infrastructure to GPU module

- Function to upload the Ptex face mapping data texture

- Add Ptex to GPUNodeLink

- Pass in object when binding material, used to get at Ptex layer data

- Add Ptex utility functions to the GLSL shader

Add loading of Ptex UVs and layer data in Cycles

Update DerivedMesh for Ptex drawing/rendering

- Temporary change to customdata mask

- Add ptex vertex attrib to DerivedMesh for GPU drawing

- Automatically add subsurf modifier if needed to get correct
tesselation pattern

Tesselation for Ptex loop layer