blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: Reduce indentation 

Since the if statement is just a NULL check, returning early is simpler
and makes reading the rest of the funtion easier.
This commit is contained in:
Hans Goudey 2020-12-27 21:26:53 -06:00
parent aa64fd69e7
commit 57fe65b17e
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
View File

@ -82,40 +82,42 @@ static void get_instanced_data__collection(
bke::PersistentCollectionHandle collection_handle =
params.get_input<bke::PersistentCollectionHandle>("Collection");
Collection *collection = params.handle_map().lookup(collection_handle);
if (collection != nullptr) {
const bool use_whole_collection = node.custom2 == 0;
if (use_whole_collection) {
if (collection == nullptr) {
return;
}
const bool use_whole_collection = node.custom2 == 0;
if (use_whole_collection) {
InstancedData instance;
instance.type = INSTANCE_DATA_TYPE_COLLECTION;
instance.data.collection = collection;
r_instances_data.fill(instance);
}
else {
Vector<InstancedData> possible_instances;
/* Direct child objects are instanced as objects. */
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
Object *object = cob->ob;
InstancedData instance;
instance.type = INSTANCE_DATA_TYPE_OBJECT;
instance.data.object = object;
possible_instances.append(instance);
}
/* Direct child collections are instanced as collections. */
LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
Collection *child_collection = child->collection;
InstancedData instance;
instance.type = INSTANCE_DATA_TYPE_COLLECTION;
instance.data.collection = collection;
r_instances_data.fill(instance);
instance.data.collection = child_collection;
possible_instances.append(instance);
}
else {
Vector<InstancedData> possible_instances;
/* Direct child objects are instanced as objects. */
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
Object *object = cob->ob;
InstancedData instance;
instance.type = INSTANCE_DATA_TYPE_OBJECT;
instance.data.object = object;
possible_instances.append(instance);
}
/* Direct child collections are instanced as collections. */
LISTBASE_FOREACH (CollectionChild *, child, &collection->children) {
Collection *child_collection = child->collection;
InstancedData instance;
instance.type = INSTANCE_DATA_TYPE_COLLECTION;
instance.data.collection = child_collection;
possible_instances.append(instance);
}
if (!possible_instances.is_empty()) {
const int seed = params.get_input<int>("Seed");
Array<uint32_t> ids = get_geometry_element_ids_as_uints(component, ATTR_DOMAIN_POINT);
for (const int i : r_instances_data.index_range()) {
const int index = BLI_hash_int_2d(ids[i], seed) % possible_instances.size();
r_instances_data[i] = possible_instances[index];
}
if (!possible_instances.is_empty()) {
const int seed = params.get_input<int>("Seed");
Array<uint32_t> ids = get_geometry_element_ids_as_uints(component, ATTR_DOMAIN_POINT);
for (const int i : r_instances_data.index_range()) {
const int index = BLI_hash_int_2d(ids[i], seed) % possible_instances.size();
r_instances_data[i] = possible_instances[index];
}
}
}