[Bf-blender-cvs] [225f174970d] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Joshua Leung]

Commit: 225f174970dba592abfc1a51c9986640bc385f06
Author: Joshua Leung
Date:   Thu Feb 8 16:16:58 2018 +1300
Branches: greasepencil-object
https://developer.blender.org/rB225f174970dba592abfc1a51c9986640bc385f06

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/depsgraph_tag.cc
index e870d2499a4,0dc1391d3a6..cd876e34da0
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@@ -92,8 -95,8 +95,9 @@@ void depsgraph_geometry_tag_to_componen
  				case OB_CURVE:
  				case OB_SURF:
  				case OB_FONT:
+ 				case OB_LATTICE:
  				case OB_MBALL:
 +				case OB_GPENCIL:
  					*component_type = DEG_NODE_TYPE_GEOMETRY;
  					break;
  				case OB_ARMATURE: