Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes.cc
index db1e8aeb9bdc072ffe89b1bf8bd20d322d3bdf4e..b65c16591dc4eea2b010ed71e6f93481b22556a6 100644 (file)
@@ -197,7 +197,7 @@ IDDepsNode *DepsgraphNodeBuilder::add_id_node(ID *id, bool do_tag)
         *
         * NOTE: Zero number of components indicates that ID node was just created.
         */
-       if (BLI_ghash_size(id_node->components) == 0) {
+       if (BLI_ghash_len(id_node->components) == 0) {
                ComponentDepsNode *comp_cow =
                        id_node->add_component(DEG_NODE_TYPE_COPY_ON_WRITE);
                OperationDepsNode *op_cow = comp_cow->add_operation(
@@ -430,7 +430,7 @@ void DepsgraphNodeBuilder::build_group(Group *group)
        }
        group_id->tag |= LIB_TAG_DOIT;
        /* Build group objects. */
-       BLI_LISTBASE_FOREACH (Base *, base, &group->view_layer->object_bases) {
+       LISTBASE_FOREACH (Base *, base, &group->view_layer->object_bases) {
                build_object(NULL, base->object, DEG_ID_LINKED_INDIRECTLY);
        }
        /* Operation to evaluate the whole view layer.
@@ -700,7 +700,7 @@ void DepsgraphNodeBuilder::build_animdata(ID *id)
                }
 
                /* drivers */
-               BLI_LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
+               LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
                        /* create driver */
                        build_driver(id, fcu);
                }
@@ -818,7 +818,7 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene)
 
        /* objects - simulation participants */
        if (rbw->group) {
-               BLI_LISTBASE_FOREACH (Base *, base, &rbw->group->view_layer->object_bases) {
+               LISTBASE_FOREACH (Base *, base, &rbw->group->view_layer->object_bases) {
                        Object *object = base->object;
 
                        if (!object || (object->type != OB_MESH))
@@ -869,7 +869,7 @@ void DepsgraphNodeBuilder::build_particles(Object *object)
                                         ob_cow),
                           DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
        /* Build all particle systems. */
-       BLI_LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
+       LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
                ParticleSettings *part = psys->part;
                /* Build particle settings operations.
                 *
@@ -1004,7 +1004,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object)
        // TODO: "Done" operation
 
        /* Cloth modifier. */
-       BLI_LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
+       LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
                if (md->type == eModifierType_Cloth) {
                        build_cloth(object);
                }
@@ -1249,7 +1249,7 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
                                         ntree),
                           DEG_OPCODE_MATERIAL_UPDATE);
        /* nodetree's nodes... */
-       BLI_LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
+       LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
                ID *id = bnode->id;
                if (id == NULL) {
                        continue;