Blender Git Loki

attempt for saving / loading and texture preservation

Merge branch 'master' into opensubdiv-modifier

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c

split the processing loops to an openmp one and an openmp free, due to crappy windows compiler error

Updated OpenVDB library to 2.3.0;

Cycles CUDA changes for kernel evaluation cancel

ammend to 02fc6ef1 (Cycles changes for shader evaluation to support
cancelling via progress cancel callback) as per Brecht's suggestion

updated master into branch

removed additional customdata markings, added openmp again (first was not working with textures)

doubled the shard count internally for fast bisect so input count and output count match

using malloc instead of calloc for bisect fracture

nullify noisemap, for now to prevent crash on loaded file, modifier free

Merge branch 'master' into opensubdiv-modifier

Enable threading on the CCG evaluation

Makes it so OSD SS modifier is about 10% slower than the
legacy one. This might be speed up further by skipping
all the tricks with CCGVert/Edge/Face intemediate storage
i guess.

Anyway, consider the current implementation not that bad.

NOTE: You need latest development version of OpenSubdiv,
otherwise threaded evaluation wouldn't work at all.

Merge remote-tracking branch 'upstream/master' into bake-cycles
(this should fix the windows build error with makesrna)

Cycles-Bake: skipping color management transformations for data passes (e.g., Normal)

Cycles-Bake: using proper colormanagement friendly routines

(note: normal maps have a problem with this changes)

changed qsort to BLI_qsort_r

IMB buffer _mask functions shouldn't convert colorspaces (ammend to
68893054)

Add evil warning when object does not have a UV map. It would be ideal
to generate a UV map, but I think algorithms all require edit mode.