Blender Git Loki

Merge branch 'master' into writefile_rework

Highlight active collection in outliner

Fix/workaround T48549: Crash baking high-to-low-poly normal map in cycles

For now only prevent crash.

Big refactor of differential override storage.

On second thought, modifying real data-block to store diff in it is...
just bad. Because it affects actual data, because it involves complicated
and heavy processes like remapping, and because it stores useless values
in .blend file (i.e. values that would give garbage results if e.g.
opening .blend file with older version of Blender, etc.).

So instead, decided to save an extra data-block in .blend file each time
we have some differential overrides.

Note that for now, we do full copy of datablock into its extra 'storage'
sibbling for .blend file. This is bad (think about double copy of heavy
mesh...) and will have to be fixed. Whole copy process will need serious
work anyway, for that kind of features we need to be able to copy
without increase usercount of IDs etc.

In fact, here, maybe we even need a smarter version of copy that would
only duplicate sub-data as needed by diff-overriden properties...

Fix T49936: Cycles point density get's it's bounding box from basis shape key

skip OpenGL debug logic on Apple

ifdef out most debugging code since Apple does not implement any debug extensions. We can revisit this if they ever do (don't expect that).

Changed output message so Mac users don't think --debug-gpu is broken.

Revert "Alembic import: don't crash on instances"

This reverts commit 9bf69ab3c1ac77ce3cb4fd6090b6e8ff722de64d. The commit
prevents instances from loading at all, which is fine in the light of
upcoming commits (where they are handled as true instances), but for now
we'd better load instances as real objects; this is the old behaviour, and
is probably preferred over not loading those instances at all.

OpenGL: enable use of AMD_debug_output

This extension is the best we have on some older supported GPU + OS combinations.

All the code was in place, just disabled.

OpenGL: remove GPU_state_print function

I was removing deprecated/obsolete state from this function. About halfway through I started questioning the need for the whole thing.

GPU_state_print is not called anywhere, but is (was) available as a development aid.

External GL debugging tools are really good these days! We should use those to examine state & not roll our own.

OpenGL: remove obsolete GL_POINT_SMOOTH

Was only used in one place, to show the 3D mouse rotation center.

rename built-in point shaders, SMOOTH --> AA

Updated shader names and code that uses them.

All of these shaders produce round points that are anti-aliased and blended against the background.

These were initially named SMOOTH because they replace glEnable(GL_POINT_SMOOTH). But SMOOTH in shader-land refers to vertex attribute interpolation (like glShadeModel(GL_SMOOTH)).

Using SMOOTH to mean two things is confusing, so we now use AA to mean "the point is anti-aliased".

OpenGL: keyframe shape fixes

- Size parameter is total size of the shape, not its radius (half size). Updated hard-coded sizes to match this.
- Shader expands size to include outline.
- Fixed fringe between outline color and transparent background.

extrapolate obvels outside of obstacle and set them afterwards with option for borderWidth

Cleanup: Grey --> Gray

setting obstacle velocities

for now we're doing this before advection. TODO: check if maybe doing this after pressure solve as in original code

Merge branch 'workspaces' into topbar

Merge branch 'blender2.8' into workspaces

Conflicts:
source/blender/editors/workspace/glutil.c
source/blender/gpu/intern/gpu_framebuffer.c

OpenGL: wm_gesture uses new imm mode

D2376 by @ianwill, part of T49043
review by @merwin

Box select, circle select, etc. Introducing the dashed-line shader! See D2376 for more info.

OpenColorIO: Update glsl implementation to be ready for ogl 3.3 core

Opengl glaDrawPixels removal: More descriptive setup.