Blender Git Loki

re-implementation of external constraints

GHOST: Remove exception from multiple context on intel cards

This exception was added in commit rB66cee6366587

Apparently the problem only occurs with Intel 9xx series cards.
Since these cards do not support OpenGL 3.2, they will not be compatible with blender2.8 anyway.

Merge branch 'blender2.8' into greasepencil-object

Fix merge errors

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'master' into soc-2017-normal-tools

Added custom loop normals to work correctly with autosmooth

external constraints load / refresh fix

fix potential memory leak

another implementation attempt for external constraints

Fix merge compiler error

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/makesrna/intern/rna_sculpt_paint.c

Remove duplicate line

Cycles: Primary rays in branched path tracing now accumulate volume intersections to allow overlapping volumes to be traversed in one single ray march.

Chnages to use OCIO

Cleanup Style

Changed by error in previous commit

Fix undo modes and mode changes

Now the Ctrl+Z does not undo the mode.

Merge branch '28' into temp-scene-obedit-remove

Object Mode: remove use of Scene.obedit

Add ED_screen_window_find, BKE_workspace_edit_object

Merge branch '28' into temp-scene-obedit-remove