Blender Git Loki

Missing 2.7x keymap update from last commit

UI: replace toggle header with a property

Alembic: catch weird exceptions from library instead of aborting Blender.

Similar to what is done e.g. in AbcMeshReader::read_mesh()...

AMD glitch: missing changes in f41ab375f38b

It was committed an earlier version of the patch which missed these changes.

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

Cleanup: add 'if 0' comment why code is repeated

Avoid potentially adding back the problem in the future.

Fix T62792: AMD glitch when clipping region in edit mode.

The `AMD Radeon HD 7600M` compiler is usually buggy for Geometry Shaders.
In this case, indexing was causing problems in `gl_in[i].gl_ClipDistance[0]`.

Reviewers: fclem

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

PyAPI: remove support for importing text blocks as modules

Allowing direct import of text blocks isn't especially useful,
instead add `text.as_module()` script authors can do this
explicitly if it's needed.

Now the text "Register" option executes
instead of loading as a module.

This removes the need to keep track of the current Main,
and C code to override Python's import & reload.

Fix T63590: Blender crashes when deleting particle hair keys

GPencil: Add option to mix color with texture

This was already supported in Fill, but not in Strokes. This adds more artistic options when use textured strokes.

Python API: allow passing integer to some BGL functions instead of bgl.Buffer

These parameters can be both pointers and offsets into a bound buffer, so we
need to support both even if it's possible to cause crashes this way.

Fix Embree link error after recent cmake changes

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

Merge branch 'master' into greasepencil-object

Merge 'master' into 'cycles_texture_cache'

Merge 'master' into 'cycles_texture_cache'

Merge 'master' into 'cycles_texture_cache'

UI: option to toggle 'Adjust Last Operation'

Cleanup: comments, wrapping

UI: Expand Enum Items Over Multiple Rows

Expanding enum items in a small area would render the names with
dots, what is a bad solution. When you use expand directly on a
`grid_flow` or `column_flow`, it will render the items on multiple
lines, giving more control to the developer.

Reviewers: campbellbarton, brecht, mont29

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

Merge 'master' into 'cycles_adaptive_sampling'

Merge 'master' into 'cycles_adaptive_sampling'