Blender Git Commits

Remove old mode switching Keymaps

These keymaps are conflicted with new mode switching keymaps.

Disable old mode switching code

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/addons
release/scripts/addons_contrib
source/blender/editors/object/object_edit.c

Add nirved's OpenCL compatibility patch

Ref T54796

A first attempt towards a OSL shader

Obviously, it doesn't work, but at least it renders something non-black...

Ref T54796

Motion Paths: Port motion path to draw manager (1/2)

Keyframe drawing is still missing but other than that it's pretty much
on part with what we had in 2.7.

DRW: Add new drawcall type DRW_CALL_RANGE

Fix parameter list for some functions after merge

Merge branch 'blender2.8' into greasepencil-object

Filter dopesheet channel to OB_GPENCIL only

This filter using ob->data is evaluated for any object type and this can produce problems.

In the future, when grease pencil dopesheet will be merge with "normal" dopesheet, this section must be recoded.

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

line drawing in one batch, greatly improve performance. modified UI.

Enable Filter Glossy for the hair shader

Ref T54796

Cleanup: Rename depsgraph variable

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_paint.c

wip

Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_info.py
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files_link.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

Bind/Unbind regions immediately when setting their face map.

Disable unlink operator for the bundle face map, since unbound bundles are not functional.

We can still end up with unbound bundles, e.g. when face maps are removed or renamed,
so it needs to be accounted for. But this should not be an explicit user action.