Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Dec 2017 14:07:42 +0000 (15:07 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Dec 2017 14:07:42 +0000 (15:07 +0100)
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/depsgraph_tag.cc

index eaa2f89ab8248a06bac4bbf58532cd8c8a8bdb6f..92dee5b55d48876719c37f9bddaf44e1d181f5e2 100644 (file)
@@ -1464,7 +1464,7 @@ void BKE_mask_update_scene(Main *bmain, Scene *scene)
        Mask *mask;
 
        for (mask = bmain->mask.first; mask; mask = mask->id.next) {
-               if (mask->id.tag & (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA)) {
+               if (mask->id.tag & LIB_TAG_ID_RECALC_ALL) {
                        bool do_new_frame = (mask->id.tag & LIB_TAG_ID_RECALC_DATA) != 0;
                        BKE_mask_evaluate_all_masks(bmain, CFRA, do_new_frame);
                }
index 6df5a5057883366363fddbc1796f52e395f41d10..494c1d5110b62ee85ab96a0269fa2c9e44ca66bf 100644 (file)
@@ -3217,7 +3217,7 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
        ntree->adt = newdataadr(fd, ntree->adt);
        direct_link_animdata(fd, ntree->adt);
        
-       ntree->id.tag &= ~(LIB_TAG_ID_RECALC|LIB_TAG_ID_RECALC_DATA);
+       ntree->id.tag &= ~LIB_TAG_ID_RECALC_ALL;
 
        link_list(fd, &ntree->nodes);
        for (node = ntree->nodes.first; node; node = node->next) {
index e928da58e8759e61ca0af75ee89f62b3e6fee5ad..ee406acb4900fbd9d14e901513267f892d9fc591 100644 (file)
@@ -601,12 +601,12 @@ void DEG_ids_clear_recalc(Main *bmain)
 
                if (id && bmain->id_tag_update[BKE_idcode_to_index(GS(id->name))]) {
                        for (; id; id = (ID *)id->next) {
-                               id->tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA);
+                               id->tag &= ~LIB_TAG_ID_RECALC_ALL;
 
                                /* Some ID's contain semi-datablock nodetree */
                                ntree = ntreeFromID(id);
                                if (ntree != NULL) {
-                                       ntree->id.tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA);
+                                       ntree->id.tag &= ~LIB_TAG_ID_RECALC_ALL;
                                }
                        }
                }