diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-01 00:43:00 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-01 00:43:23 +0300 |
commit | bff83ecee51b81a583ea954f61ca907c2a0d1d56 (patch) | |
tree | 58d2007f295795ea56c209fdc32f4aba655e6cfb /source/blender | |
parent | 71c76d596c55e53330a457fa19d1831d7460a138 (diff) |
Cleanup: Add missing breaks in previous commit
I missed compile warnings for these. Sorry for the noise.
Also combine assignments with null checks to save a few lines.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 5fbe77af2d7..83775be8c9e 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -142,34 +142,35 @@ static void add_used_ids_from_sockets(const ListBase &sockets, Set<ID *> &ids) LISTBASE_FOREACH (const bNodeSocket *, socket, &sockets) { switch (socket->type) { case SOCK_OBJECT: { - Object *object = ((bNodeSocketValueObject *)socket->default_value)->value; - if (object != nullptr) { + if (Object *object = ((bNodeSocketValueObject *)socket->default_value)->value) { ids.add(&object->id); } + break; } case SOCK_COLLECTION: { - Collection *collection = ((bNodeSocketValueCollection *)socket->default_value)->value; - if (collection != nullptr) { + if (Collection *collection = + ((bNodeSocketValueCollection *)socket->default_value)->value) { ids.add(&collection->id); } + break; } case SOCK_MATERIAL: { - Material *material = ((bNodeSocketValueMaterial *)socket->default_value)->value; - if (material != nullptr) { + if (Material *material = ((bNodeSocketValueMaterial *)socket->default_value)->value) { ids.add(&material->id); } + break; } case SOCK_TEXTURE: { - Tex *texture = ((bNodeSocketValueTexture *)socket->default_value)->value; - if (texture != nullptr) { + if (Tex *texture = ((bNodeSocketValueTexture *)socket->default_value)->value) { ids.add(&texture->id); } + break; } case SOCK_IMAGE: { - Image *image = ((bNodeSocketValueImage *)socket->default_value)->value; - if (image != nullptr) { + if (Image *image = ((bNodeSocketValueImage *)socket->default_value)->value) { ids.add(&image->id); } + break; } } } |