Blender Git Loki

Merge remote-tracking branch 'upstream/master' into bake-cycles

(this should fix windows building hopefully)

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

Compositor squashed patch reapplied

Started with the MemoryBufferValue
still a lot needs to be done
stopped at testing the dilate/erode

TILES: did some fixed for value buffer

Determine image format of OpenCL device

TILES: TextureNode fix

TILES: moved buffer sizes to constants for easy access.

TILES: fixed some nodes.
still working on the defocus node

TILES: fixed glare, keying, defocus, normalize, vector curves

Support edge evaluation for triangles and ngons

Still gives issues for NGons and also it's something
strange going on when applying modifier on the triangle.

Triangles seems to be looking all fine for until the
modifier is applied on the mesh, but ngons still needs
some investigation.

Also, just understood that old SS code did something
special with triangles, it didn't handle triangles in
the same way as NGons. The thing is, treating triangles
as ngons makes them looking as if some crease is being
applied on the corners.

Would need to write some special case for this in
opensubdiv case.

Moving towards support of NGons and triangles

It's done by creating a per-corner faces in OpenSubdiv
and interpolating them directly into CCG.

Grids interpolation by itself is done, but no edges are
being interpolated at this moment.

Also current way of creating "fake" per-corner faces
subdivides edges for every original face, which means
mesh would loose manifold when having two adjacent
tris or ngons.

At least nothing crashes at this point so don't see
a reason why not to consider this is a milestone.

Code cleanup: reshuffle some code into helper functions

Makes it overall code flow easier to follow.

Made quads fully working now

Still a bit hackish and unclean, but that's rather good starting point
before moving to tris/n-gons support.

- Fixed face-to-corner u/v mapping which was wrong for some cases.
- Made it so edges are getting nicely evaluated.

Major refactor of the current state of the patch

- Using new OpenSubdiv C-API from the Dirk's patch D132
- Split ccgSubSurf__syncOpenSubdiv into set of smaller functions.
- Drop intern/opensubdiv, it needs to be ported to current
OpenSubdiv code anyway and currently not really needed.
- Use smarter detection of OpenSubdiv libraries since now we're
not only using osdCPU library.

Fix compilation error with the current OpenSubdiv repository

Initial integration of OpenSubdiv into Subsurf modifier

Summary:
This commit is an initial implementation of subsurf
modifier using OpenSubdiv instead of our older CC.

This doesn't change data layout and only uses OpsnSubdiv
evaluation API to get coordinates and values for grid
elements.

Main changes:

- Tweaked build systems to add flag to build with OSD.
- Added C-API for opensubdiv, so it might be used from
blender kernel.
- Subsurf evaluation is hacked in into CCGSubSurf.

TODO:
- Clean up all the WIP code, make it more clear
separation between legacy CCGSubSurf code and new
one based on OSD evaluation.
- Edges are not evaluating currently at all.
- UVs subdivision currently would lead to incorrect
memory usage.
- Subdivision happens in a single thread.
- Loose edges are not supported.
- Only quads does work now, need to support
triangles and N-gons.

Only committing this to share via developer.b.o with
other developers who are interested.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D56

Cycles-Bake: silence rna warning and code cleanup

Cycles-Bake: Tangent baking from multires

Every time the user bakes a normal tangent map with no active to
selected we (most likely) want to get it from the multiresolution
modifier.

Whiles this is working now, selected to active should be working
correctly just as before.

Cycles-Bake: Support for multiple high-poly objects selected at once

When using "selected to active" the user can now have more than one
highpoly object for a single lowpoly object.

Code note: instead of implementing a new BHV method to create a tree
with multiple meshes, we are casting the ray to the individual trees
(for each highpoly object) and comparing the distances. It could be
optimized with the BVH change, but it will do for now.

Also note: the same method can be used to implement 'Blockers'.

Change the clone tool to use the new slot system.

When clone from layer is active, a layer selection will be available in
the the layer panel and the tool will sample from the selected clone
layer.

This is not ideal UI wise, the user has to change between tabs and
panels to set the option - Maybe a good reason to rethink about setting
the layer panel to the right.

This makes the mtface_clone_layer functions and data obsolete for
texture painting.

Fix for variable declaration after code (invalid C).

mac does not support memorystreams (fmemopen and open_memorystream) as well... using regular file there too

was merged incorrectly as well...

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_image_2d.c

Cleanup:

* Header clanup
* Hide Add slot operator for node based materials. This could be a per
engine callback, but for now just disable.

Support for node materials in texture painting.

This will just enamerate any image nodes in the node tree and use that.

those were merged incorrectly from and older branch, error was visible in windows. (crashes)