Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 10:57:36 +0000 (12:57 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Apr 2018 10:57:36 +0000 (12:57 +0200)
1  2 
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc

index 7d606629acbdbb2c48d6b83692500dbf16e2ee18,1613e9f6e5327e11d5fc800debee1f16f0c5e54d..565218d8be009dececbfede8c18c3ee01045b934
@@@ -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;
        }
  }
  
index 5e25f60e3ac3c3f27fe654e331d65180890699f9,6f3686f2a10191de2a8b12d340a976fafee6a9ba..96a99eea624b90bdc135e8703d41d976bee588aa
@@@ -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;
        }
  }