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

[Antonio Vazquez]

Commit: 788a6d078e25332e088fbdd5533253832015606f
Author: Antonio Vazquez
Date:   Thu Jun 21 16:14:26 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB788a6d078e25332e088fbdd5533253832015606f

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 3d6765766b4,3354f85bf27..1f759517bec
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -541,10 -533,17 +541,13 @@@ void DepsgraphNodeBuilder::build_object
  	if (object->particlesystem.first != NULL) {
  		build_particles(object);
  	}
 -	/* Grease pencil. */
 -	if (object->gpd != NULL) {
 -		build_gpencil(object->gpd);
 -	}
  	/* Proxy object to copy from. */
- 	if (object->proxy_from) {
+ 	if (object->proxy_from != NULL) {
  		build_object(-1, object->proxy_from, DEG_ID_LINKED_INDIRECTLY);
  	}
+ 	if (object->proxy_group != NULL) {
+ 		build_object(-1, object->proxy_group, DEG_ID_LINKED_INDIRECTLY);
+ 	}
  	/* Object dupligroup. */
  	if (object->dup_group != NULL) {
  		build_collection(DEG_COLLECTION_OWNER_OBJECT, object->dup_group);