Blender Git Commits

Merge branch 'master' into asset-experiments

Note that closest_point_on_mesh is in object space

Fix T45237: Dither dosn't work in Blender Internal Renderer after Multi-View

Fix .obj testing.

Cleanup: Use GPU material counter instead of allocating new counter
array every time.

Refactor subsurf multi material textured drawing.

Use the same system as cdderivermesh - still result is not correct
though.

GLSL fix one more error - meant that attributes would not get uploaded
correctly.

Merge branch 'master' into temp_display_optimization

Merge branch 'master' into GPencil_Editing_Stage3

Temporarily fix crash until subsurf textured multi material is
completely supported.

GLSL drawing redesign:

Use new upload scheme. Idea here is that materials share a VBO where
the size of each element is the maximum size of all mesh materials.

While this will waste some size if material sizes differ it is the
simplest scheme to use and allows easy reuse of indices as opposed to
separating the materials in separate vertex buffers. In fact if we do
that, management gets quite complex and code much more error prone.

I may write an extra blog post to explain the choices here
at some point.

Merge branch 'master' into temp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c
source/blender/bmesh/tools/bmesh_region_match.c
tests/gtests/blenlib/BLI_ghash_performance_test.cc
tests/gtests/blenlib/BLI_ghash_test.cc
tests/gtests/blenlib/CMakeLists.txt

Merge branch 'master' into temp-ghash-setops

Redesign of textured drawing: Get rid of triangle_to_mface array

Instead we can be smarter here and add an mface array to the
GPUBufferMaterial instead.
This will help us do less iterations on CPU for quad meshes as well as
avoiding checking materials every face (faces are now always sorted per
material so this happens implicitly).

Blender 2.75: Point addons to updated release revision

Fix T45234: Stereo Parallel vs. Off-Axis

Parallel rendering was not working.

The idea of having parallel convergence mode to render as parallel but
visualize as off-axis was good, but it was leading to some complications
in the code.

I think it's more clear to the user if parallel looks and render as
parallel, and if she wants to pre-visualize the converged planes, simply
temporarily set the camera to off-axis.

SCons: Fix missing file in kernel when building on OSX

SCons: Another attempt to fix bundling on OSX

SCons: Fix wrong bunding of Cycles kernel on OSX platform

Fix part of code in `load_image_single()` wrongly disabled when WITH_OPENEXR was disabled.