Blender Git Loki

OpenGL: fix compatibility with Mac & Mesa

This combines the Mesa fix (16e929e6ff1007d057d183b56bb7fc2d1f8aae53 by @brita_) with the Mac fix (89e23c743e601940fc051189ef01c537233d2043 by @merwin).

And uses the same fix for another call to glFramebufferTexture introduced in f1fb605ec9ffd69b82652f3702de8b7ada570fd8.

Gawain: define feature macros in a more compatible way

Thanks to @sergey for proactively testing clang 4.0, which does not accept defined(FOO) as part of macro definitions.

Cleanup: replace num/ct/tot with 'len'

Alembic import: little fix for D2634

Now it doesn't crash any more when the Alembic curves object doesn't
have any user properties.

Merge branch 'master' into blender2.8

Fix text drawing with core profile

The issue was going to the fact that GL_ALPHA was deprecated in core profile
and common solution online is to use GL_RED instead. That is what is done in
this commit.

Alembic import/export: write curve resolution to user property

Curve resolution isn't natively supported by Alembic, hence it is stored
in a user property "blender:resolution". I've looked at a Maya curves
example file, but that also didn't contain any information about curve
resolution.

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

Reviewers: kevindietrich

Merge remote-tracking branch 'origin/master' into blender2.8

Revert "Object Info node support for GLSL mode and the internal render"

This reverts commit 76425feed8644a8fe1c0e52ef3f77b95012ba44e.

** Note **
This was supposed to be a merge, but it was rebased.

Cleanup: missing headers

Cleanup: replace num/ct/tot with 'len'

OpenGL: Update GPU_legacy_stubs.c

The list is now re-ordered too.
And we are no longer including the new tokens suggestions here (the ones
defined as USE_ in gl-deprecated.h)

OpenGL: Comment out the old tokens from gl-deprecated

Those tokens are still valid. Although we should not being using them,
they should not prevent us from building with core profile.

In the future we can have a new flag WITH_GL_CORE_STRICT for those.
But only after we build with core profile by default

BGL: Remove deprecated enums

Note: The enums that are deprecated and supported are still there

Eevee: Fix warning

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

Draw Manager: T51218 Support edit-mesh hide

Fix install_deps.sh for new Ubuntu 17.04, which does not have libopenjpeg!

Use better workaround ofr getting scene layer for Derivedmesh's mask

This replaces access to the first scene layer (which was wrong) with a linear
lookup of scene layer by it's active index.

This seems to be a better temporary solution to have things working for until
we've got proper workspace, depsgraph and it's per-layer storage in place.

Remove deprecated GL_LIGHTING chunk from manipulator draw code.

This is new feature, will likely need own shader to get same result.
Just commented it as TODO, though, this is not high priority.

Part of T51164.