Blender Git Loki

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/render/intern/source/external_engine.c

cleanup: redundant include & defines

GLEW takes care of this.

VAOs are not part of OpenGL 2.1 but are very widely supported. Even so
we should check before using. Current code does not check.

Also minor style things I missed in the previous commit.

Merge branch 'master' into temp-ghash-setops

cleanup: code style

C-style comments, braces & pointer placement.

compile fixes for MSVC

draw grid floor & objects in new viewport

Yanked verbatim from view3d_draw_objects, so thereâ??s nothing â??newâ?
about drawing method. But it does let us see objects positioned in
space which shows us transforms are working properly.

OpenGL batched geometry API (experimental)

Clean slate design, with some overlap with existing Blender APIs. Using
GPUx_ prefix to avoid confusion with current GPU_ files.

- specify vertex attribs
- buffer in main memory & VRAM
- build element lists of points, lines, triangles
- draw these --^
- state tracking (fairly basic)
- lots of error & bounds checking!!! can turn this off

The idea is to handle things like VBOs, VAOs, other useful extensions
automatically so users of this API don't have to work hard to get it
right every time. This also lets us turn things on/off in one place for
debugging & perf measurements.

- - - -
Checking this code in now to give it a home & test on multiple systems.
Itâ??s not being used yet and will probably evolve quite a bit as our
needs become clearer.

Removing XXX MV: sequencer already supports multiview movies

Fix for corruption of the item hash table in cache libraries on copy.

WIP Commit

Removing XXX MV: remove renderlayer.rect from the API

Merge branch 'master' into temp-ghash-setops

Get rid of varargs in union & co functions (using variadic macros instead).

renaming MV to XXX MV

Removing XXX MV: viewport render preview does not support multiview

Assert that shouldn't happen but that happens sometimes, still to be investigated throughly

From review: check compositor viewer node image only as part of initExecution

I actually put it under ::initImage(), this way it runs only for the active output viewer

Merge branch 'master' into gooseberry

Get rid of old panel for GPU depth of field settings

Merge branch 'master' into gooseberry