Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

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

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.

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

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

Fix missing renames in previous commit

Cleanup: some missing renames from last commit

Also whitespace edits

Merge branch 'blender2.8' into greasepencil-object

Cleanup: rename color members in gpencil style

It reads like a bug to store alpha in variables named 'rgb'

Also remove some redundant casts.

Cleanup: remove gp_ prefix from variable names

These are already in a grease pencil struct.

Merge branch 'blender2.8' into greasepencil-object

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

Conflicts:
intern/cycles/blender/blender_python.cpp

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

f32a7.

Merge branch 'blender2.8' into greasepencil-object

fixed weird problem in blender/blender_python.cpp

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