Blender Git Loki

Make BKE_ptex_update_from_image return bool for failure

Sync up Ptex include dirs between SCons and CMake

Fix ImBuf memory leak in Ptex

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

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

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

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

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