Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-01-24 17:34:33 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-01-24 17:34:33 +0300
commit9f713ec962a6aa4ab2eef764c76b1d3b49658f63 (patch)
treeef5513688e98940a188825756f598d1c3bde751d /source
parent9c493ca378d3458881750f046bdb170affcae133 (diff)
Depsgraph: Cleanup, line wrap
Diffstat (limited to 'source')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_query_iter.cc24
1 files changed, 15 insertions, 9 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 42d512d473c..019bc613632 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -90,10 +90,13 @@ static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
if (dob->collection_properties != NULL) {
temp_dupli_object->base_collection_properties = dob->collection_properties;
- IDP_MergeGroup(temp_dupli_object->base_collection_properties, dupli_parent->base_collection_properties, false);
+ IDP_MergeGroup(temp_dupli_object->base_collection_properties,
+ dupli_parent->base_collection_properties,
+ false);
}
else {
- temp_dupli_object->base_collection_properties = dupli_parent->base_collection_properties;
+ temp_dupli_object->base_collection_properties =
+ dupli_parent->base_collection_properties;
}
copy_m4_m4(data->temp_dupli_object.obmat, dob->mat);
@@ -146,15 +149,16 @@ static void DEG_iterator_objects_step(BLI_Iterator *iter, DEG::IDDepsNode *id_no
return;
}
- if ((data->flag & DEG_ITER_OBJECT_FLAG_DUPLI) && (object->transflag & OB_DUPLI)) {
+ if ((data->flag & DEG_ITER_OBJECT_FLAG_DUPLI) &&
+ (object->transflag & OB_DUPLI))
+ {
data->dupli_parent = object;
data->dupli_list = object_duplilist(&data->eval_ctx, data->scene, object);
data->dupli_object_next = (DupliObject *)data->dupli_list->first;
-
- const eObjectVisibilityCheck mode = (data->mode == DEG_ITER_OBJECT_MODE_RENDER) ?
- OB_VISIBILITY_CHECK_FOR_RENDER :
- OB_VISIBILITY_CHECK_FOR_VIEWPORT;
-
+ const eObjectVisibilityCheck mode =
+ (data->mode == DEG_ITER_OBJECT_MODE_RENDER)
+ ? OB_VISIBILITY_CHECK_FOR_RENDER
+ : OB_VISIBILITY_CHECK_FOR_VIEWPORT;
if (BKE_object_is_visible(object, mode) == false) {
return;
}
@@ -234,7 +238,9 @@ void DEG_iterator_objects_end(BLI_Iterator *iter)
{
#ifndef NDEBUG
DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
- /* Force crash in case the iterator data is referenced and accessed down the line. (T51718) */
+ /* Force crash in case the iterator data is referenced and accessed down
+ * the line. (T51718)
+ */
memset(&data->temp_dupli_object, 0xff, sizeof(data->temp_dupli_object));
#else
(void) iter;