Blender Git Loki

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

Snake works. Added color options. Performance need optimization.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object