Blender Git Loki

Add fatal error in CMake when trying to build WITH_GAMEENGINE but without WITH_LEGACY_OPENGL

This won't work currently.

Object Info node support for GLSL mode and the internal render

Object Info node can be useful to give some variation to a single material assigned to multiple instances. This patch adds support for Viewport and BI.

{F499530}

Example: {F499528}

Reviewers: merwin, brecht, dfelinto

Reviewed By: brecht

Subscribers: duarteframos, fclem, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov

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

OpenGL: fix Mac crashing on startup

On Apple we use OpenGL 2.1 + an ARB extension for framebuffers.

The glFramebufferTexture function is part of OpenGL 3.0 but not part of the ARB extension. This commit fills that gap.

All other platforms are using GL 3.0+ already so it's not an issue there. All platforms (Mac too) will use GL 3.3+ soon so this workaround will be removed.

Fix T49429: incorrect Blender internal viewport border render with DrawPixels method.

Alembic import: greatly improved curve/hair import performance

The U-resolution of the imported curves was kept at the default value
of 12, which is way too high for imported hair. We export hair at a
fairly high resolution already, so it's not needed to subdivide even
further when importing.

Of course this may have an impact on other curves that do require this
U-resolution to be higher. In that case the resolution can be
increased after importing.

I removed the default nu->orderu = num_verts, as that allowed every
point to influence the entire spline, which was more expensive for the
CPU, and unlikely to be needed. The orderu computations had off-by-one
errors in the curve importer, which are now also fixed. The correct
values are:

- Linear: orderu = 2
- Quadratic: orderu = 3
- Cubic: orderu = 4

These values are also what is stored in the Alembic file for curves of
type kVariableOrder, according to the reference Maya exporter
maya/AbcExport/MayaNurbsCurveWriter.cpp, function
MayaNurbsCurveWriter::write(), in the Alembic source code.

The result is a frame rate increase of roughly 100x (tested with one
100-hair test on one machine, so take with grain of salt).

Gawain: fix crash when drawing batches (e.g., scale manipulator)

Introduced in b02786ae6b

Added simple unittests for Alembic exporter

This test checks that a set of cubes are exported with the correct
transform, both with flatten=True and flatten=False.

This commit also adds an easy to use superclass for upcoming Alembic
unit tests.

Merge branch 'master' into blender2.8

Conflicts:
source/blender/alembic/intern/abc_exporter.cc

Fix Blenderplayer (c)

Cleanup: triple quotes for docstrings

BLF: avoid glyph cache use-after free

Causes crash if the font size isn't set after clearing (see T51200)

Buildbot: Fix typos

Buildbot: Attempt to fix CUDA compilation on OSX

Stupid toolkit is really fragile about CLang version.

OpenGL: use ShaderInterface to look up uniforms

These were the last few glGetUniformLocation calls in source/blender.

The new system gets uniform information once when a shader is created, then uses this cached info every time after that.

Revert "OpenGL core: add some missing gpuBegin to allow clay with no UI"

This reverts commit 1c01811cce00b799ee94aad24083ddf3954a5829.

It broke everything.

Draw Manager: lattice editmode drawing

UI: Add/Improve a few tooltips

See T51061

OpenGL core: add some missing gpuBegin to allow clay with no UI

OpenGL: do not support legacy matrix when using core profile

Remove deprecated opengl stuff from opensubdiv

This removes glGetBooleanv queries for GL_LIGHTING. This has been #ifdef'd
out with legacy opengl disabled. Thus a false positive still shows up in
the gl queries. Also, note that this removes support for wireframes in
opensubdiv, when desabling legacy opengl, which should be fixed later.

Part of T49043