Blender Git Loki

OpenSubdiv: Define NOMINMAX on Windows platform

This way we can compile with current policy of OpenSubdiv,
this is for at least until this defines are figured out
from the OpenSubdiv side.

OpenSubdiv: Initial support of crease

For now only works for display viewport and it's not dynamically
updating.

Dynamic update will be solved from Blender side, but rendering
is more tricky because it uses evaluator API which seems to
ignore crease tags currently.

OpenSubdiv: Prevent garbage shading when displaying vertex colors/weights

This is for cases when vertex colors or weights are visualising. Currently
we don't have CD layers for this data and here we only make it so there's
no garbage displayed.

In the future we'll either need to have CD for this data or pass this data
as face-varying or vertex-varying data in OSD mesh.

OpenSubdiv: Fix crash when switching object and edit modes

Crash was caused by by the OpenGL access from the treads.

Merge branch 'master' into opensubdiv-modifier

Conflicts:
build_files/cmake/macros.cmake
extern/CMakeLists.txt
extern/SConscript
extern/clew/include/clew.h
extern/cuew/auto/cuew_gen.py
extern/cuew/src/cuew.c
source/blender/compositor/intern/COM_WorkScheduler.cpp

gamengine: removing useless comment

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Cycles: Use bool for is_leaf bvh property.

* This is not actually copied to the device, so we can use a bool here, which is smaller than a int.

Linux running error fixed. Replay sim error fixed

New mesher (proper ngon, orco, etc).

passing correctly rotated geometry to manta

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

Fix crash when opened EXR image had views not present in the scene views

Fix for bad memory access: interp_weights_face_v3 requires a full 4
float elements, even if one or more vectors are not used.

Removed duplicate root drawing code, this is now in a separate debug
function.

Added a rebuild function for "object components" (i.e. hair).

This ensures that rigid bodies get added back into the world when the
animation loops around and the rigid body world gets destroyed and
rebuilt.

Fix cuddly strips shading and drawing issues. Also now there are no
issues on big zooms (they behave really cuddly)

fix for exr images not loading in Linux

Note to self, go over the code and try to find other cases when I used BLI_snprintf to make sure I didnt use the same string as source and dest (it works in OSX, but not in Linux)

Avoid adding all the hair point rigid bodies to the CollisionWorld.

Instead we now use a single box-shaped collision object for the whole
hair system, and then do direct contact tests for the point objects
when there is a potential contact. This avoids O(n^2) issues when
inserting lots of collision objects into a DbvtBroadphase.

The points now have a radius property of their own as well.