Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / eval / deg_eval_flush.cc
index c0d5e08b80fd233036cc21798979c1043dacbc4c..b4e1c2f4e1a40eb38207b194fb27b39b091d7e0c 100644 (file)
@@ -214,7 +214,7 @@ void flush_engine_data_update(ID *id)
                return;
        }
        Object *object = (Object *)id;
-       BLI_LISTBASE_FOREACH(ObjectEngineData *, engine_data, &object->drawdata) {
+       LISTBASE_FOREACH(ObjectEngineData *, engine_data, &object->drawdata) {
                engine_data->recalc |= id->recalc;
        }
 }
@@ -271,7 +271,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
        BLI_assert(bmain != NULL);
        BLI_assert(graph != NULL);
        /* Nothing to update, early out. */
-       if (BLI_gset_size(graph->entry_tags) == 0) {
+       if (BLI_gset_len(graph->entry_tags) == 0) {
                return;
        }
        /* Reset all flags, get ready for the flush. */