[Bf-blender-cvs] [ef22b837e8e] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: ef22b837e8e22fd1d6f566edeef9d090032e0996
Author: Sergey Sharybin
Date:   Wed Apr 4 12:57:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBef22b837e8e22fd1d6f566edeef9d090032e0996

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 7d606629acb,1613e9f6e53..565218d8be0
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@@ -128,10 -126,20 +128,22 @@@ static void modifier_walk(void *user_da
                            int /*cb_flag*/)
  {
  	BuilderWalkUserData *data = (BuilderWalkUserData *)user_data;
- 	if (*obpoin) {
- 		data->builder->build_object(NULL,
- 		                            *obpoin,
- 		                            DEG_ID_LINKED_INDIRECTLY);
+ 	ID *id = *idpoin;
+ 	if (id == NULL) {
+ 		return;
+ 	}
+ 	switch (GS(id->name)) {
+ 		case ID_OB:
 -			data->builder->build_object(NULL, (Object *)id);
++			data->builder->build_object(NULL,
++			                            (Object *)id,
++			                            DEG_ID_LINKED_INDIRECTLY);
+ 			break;
+ 		case ID_TE:
+ 			data->builder->build_texture((Tex *)id);
+ 			break;
+ 		default:
+ 			/* pass */
+ 			break;
  	}
  }
  
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 5e25f60e3ac,6f3686f2a10..96a99eea624
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -127,8 -126,20 +127,20 @@@ void modifier_walk(void *user_data
                     int /*cb_flag*/)
  {
  	BuilderWalkUserData *data = (BuilderWalkUserData *)user_data;
- 	if (*obpoin) {
- 		data->builder->build_object(NULL, *obpoin);
+ 	ID *id = *idpoin;
+ 	if (id == NULL) {
+ 		return;
+ 	}
+ 	switch (GS(id->name)) {
+ 		case ID_OB:
 -			data->builder->build_object((Object *)id);
++			data->builder->build_object(NULL, (Object *)id);
+ 			break;
+ 		case ID_TE:
+ 			data->builder->build_texture((Tex *)id);
+ 			break;
+ 		default:
+ 			/* pass */
+ 			break;
  	}
  }