Blender Git Loki

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_image_api.c

Increase Ptex default packing width

Fix comparison in Ptex layout packing

WIP code to use in scene drawing for widgets.

Fix max_width calculation in Ptex packed layout

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

Merge branch 'master' into depsgraph_refactor

Use BPX for Ptex resizing

Depsgraph: Make freestyle compatible with C++11

This commit makes code aware of auto_ptr being deprecated in C++11 and
makes it so unique_ptr is used instead. There is now utility header file
for this which defines AutoPtr to either unique or auto pointer.

The only unclear thing is how to cast unique_ptr to pointer of another
type. getting some weird compiler issue with that. So if some of the
C++ guys around can have a look that'd help a lot. For now using really
dumb approach to solve that.

This doesn't mean freestyle works with new depsgraph -- there is some
missing scene update which makes lines being misaligned with the scene.
Will have a look later into this issue. But with --legacy-depsgraph
command line argument freestyle still seems to work.

Improve error handling and comment for Ptex resize

Use BPX for BKE_ptex_update_from_image

That should make it correct for different data types, channels, etc.

Also added API comment.

Depsgraph: Fix compilation error with C++11 disabled

Fix warning in py code.

Make BKE_ptex_update_from_image return bool for failure

Sync up Ptex include dirs between SCons and CMake

Merge branch 'wiggly-widgets' into gooseberry

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

Merge branch 'GPU_subsurf' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c

Basic UI elements and RNA option properties for particle modifiers.

Fix for particle modifier type enum callback, was using mesh modifier
items.

Register the particle modifier operators.