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

[Joshua Leung]

Commit: 37168c76fe126c835af68a09da00efa1d249a696
Author: Joshua Leung
Date:   Wed Oct 25 23:52:10 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB37168c76fe126c835af68a09da00efa1d249a696

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 772e28826fe,d7ef1c19c61..6710cd8c197
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -1237,22 -1236,14 +1236,22 @@@ void DepsgraphNodeBuilder::build_gpenci
  {
  	ID *gpd_id = &gpd->id;
  
- 	/* gpencil itself */
- 	// XXX: what about multiple users of same datablock? This should only get added once
- 	add_id_node(gpd_id);
+ 	/* TODO(sergey): what about multiple users of same datablock? This should
+ 	 * only get added once.
+ 	 */
  
- 	/* The main reason Grease Pencil is included here is because the animation (and drivers)
- 	 * need to be hosted somewhere...
+ 	/* The main reason Grease Pencil is included here is because the animation
+ 	 * (and drivers) need to be hosted somewhere.
  	 */
  	build_animdata(gpd_id);
 +}
 +
 +void DepsgraphNodeBuilder::build_palette(Palette *palette)
 +{
 +	ID *palette_id = &palette->id;
 +
 +	add_id_node(palette_id);
 +	build_animdata(palette_id);
  }
  
  void DepsgraphNodeBuilder::build_cachefile(CacheFile *cache_file)