[Bf-blender-cvs] [bff83ecee51] master: Cleanup: Add missing breaks in previous commit
Hans Goudey
noreply at git.blender.org
Mon Jan 31 22:43:35 CET 2022
Commit: bff83ecee51b81a583ea954f61ca907c2a0d1d56
Author: Hans Goudey
Date: Mon Jan 31 15:43:00 2022 -0600
Branches: master
https://developer.blender.org/rBbff83ecee51b81a583ea954f61ca907c2a0d1d56
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.
===================================================================
M source/blender/modifiers/intern/MOD_nodes.cc
===================================================================
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;
}
}
}
More information about the Bf-blender-cvs
mailing list