Blender Git Loki

Merge branch 'master' into id_override_static

Merge branch 'master' into asset-engine

BLF: simplify API for default font

We had two versions of several BLF functions -- one for a specific font ID & another for the default font.

New BLF_default function lets us simplify this API & delete the redundant code.

fix most UI text color

There are still many places to fix. I'll miss the bright yellow!

This commit also uses the new BLF_default function where possible.

Part of T49043 since we call glColor less often.

add BLF_default function

So we don't need two versions of all other BLF functions -- one for specific font ID & another for the default font.

OpenGL: use GL4 on Linux when available

Minimum target is still 3.3

On AMD pro driver, asking for a 3.3 context gives us *exactly* 3.3, not 3.3+ as desired.

Have not tested proprietary NV or Intel drivers, but this fix should work on all vendors.

Cleaning of the last commit: lack of attention with the debug of time X(

This was a stupid mistake

Optimize BVHTree creation of vertices that have BLI_bitmap test

Instead of reference the vertex first and test the bitmap afterwards. Test the bitmap first and reference the vertex after.

In a mesh with 31146 vertices and the entire bitmap disabled, the loop time is 243% faster
With all bitmap enabled, the time becomes 463473% faster!!!

One possible reason for this huge difference in peformance is that maybe the compiler is not putting the function "BM_vert_at_index" inline (I dont know if buildbot do this, but it's good to investigate).

fix T50592: Scene.raycast not working

Ray_start and ray_normal values were being ignored

Fix (unreported) crash in new snap code.

Looks like `object_map` and `mem_arena` may be NULL sometimes...

Also, cleaned up function pointers declaration of Nearest2dUserData,
those were warning out in gcc. Please, *always* use typdef defined
prototypes for function pointers, it is sooooo much cleaner and clearer
that way. And easy to convert from compatible functions too.

Fix T50590: BI lamp doesn't hold a texture in this case.

BKE_lamp_free was somehow missing the refactor of datablocks handling
(which, among other things, completely separated ID refcounting and
linking management from ID freeing itself).

Either forgot during development, or lost during merge...

Fix regression on plasticity caused by sewing springs

I must have been sleeping when I committed the fix for the sewing
springs regression, causing another silly regression on plasticity...

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Cycles Denoising: Move denoising kernels to a separate compilation unit

Previously, the denoising kernels were just included with the other kernels.
However, that is not ideal, since the kernels already take very long to compile. Also, it isn't needed since the rendering and denoising kernels share basically no code.

So, this commit adds intern/cycles/filter/, which contains the filtering kernels.

Snap System: Use callbaks to differentiate how referenced vertives of DerivedMeshs and Bmeshs

Before it was informed the type of object in the `userdata`, and a same function ran between the types to obtain the coordinates of the vertices

Remove flag: `SNAP_OBJECT_USE_CACHE` from snap_context

Since the cache is created in one way or another, this flag is not really making a difference
More details here: D2496

Add collision response quality control

Merge remote-tracking branch 'origin/clay-engine' into render-layers

Blender release: We are officially 'b' now

Build Clay engine by default