Blender Git Loki

Merge branch 'master' into opensubdiv-modifier

Conflicts:
CMakeLists.txt
source/blender/blenkernel/intern/subsurf_ccg.c

OpenSubdiv: Some last minute improvements

- use utility function to define shader's input, output types
and number of vertices.

- Make sure #version 150 is never used if blender is built
without OpenSubdiv.

OpenSubdiv: Fix for #version being defined multiple times for geometry shader

Cleanup: spelling

Cleanup: whitespace

Minor tweaks, cast spacing & unused macro

Quiet unused warning

OpenSubdiv: Some more compilation error fixes

OpenSubdiv: Fix compilation error of CCG with disabled OpenSubdiv

OpenSubdiv: Minor cleanup

OpenSubdiv: Make sure tabs are used for indentation

OpenSubdiv: Fix some bad array subscriptions in drawing code

OpenSubdiv: Can't really avoid passing subdiv level to GL mesh construction

Topology is not refined at that point yet and does not contain any information
about subdivision level.

Merge branch 'master' into opensubdiv-modifier

OpenSubdiv: Fixes to make branch compilable on Windows

Only teested CMake for now, checking SCons will happen later.

OpenSubdiv: Fix compilation error with strict flags in release mode

Merge branch 'master' into opensubdiv-modifier

OpenSubdiv: Experiments with CPU face-varying interpolation

It's kind of a failure actually because face-varying interpolation is not
supported yet by limit evalaution API, meaning we can't really do CPU side
UV map evaluation.

This commit lays down some basis of the work for future and finished vertex
varying evalaution which was used here for some quick tests.

OpenSubdiv: Initial implementation of face varying data interpolation in evaluator

Not really used at this moment, but will be quite soon.

Also removed unused non-volatile evaluator for now to make code much smaller.

OpenSubdiv: Remove some deprecated arguments from GL Mesh CAPI