Commit: 654ae4145f412029f28a26832e7394f000598ac6
Author: Sergey Sharybin
Date: Fri Feb 1 10:24:12 2019 +0100
Branches: master
https://developer.blender.org/rB654ae4145f412029f28a26832e7394f000598ac6
Cleanup: Space for foreach macro
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph_query_filter.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
===================================================================
diff --git
a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index a06c1397005..844b98b52a3 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -101,7 +101,7 @@ void DepsgraphNodeBuilder::build_view_layer(
int base_index = 0;
const int base_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ?
BASE_ENABLED_VIEWPORT : BASE_ENABLED_RENDER;
- LISTBASE_FOREACH(Base *, base, &view_layer->object_bases) {
+ LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
/* object itself */
const bool is_object_visible = (base->flag & base_flag);
if (is_object_visible) {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index c96ccbc3696..1fdae02d23a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1203,7 +1203,7 @@ void
DepsgraphRelationBuilder::build_animdata_curves_targets(
/* Iterate over all curves and build relations. */
PointerRNA id_ptr;
RNA_id_pointer_create(id, &id_ptr);
- LISTBASE_FOREACH(FCurve *, fcu, curves) {
+ LISTBASE_FOREACH (FCurve *, fcu, curves) {
PointerRNA ptr;
PropertyRNA *prop;
int index;
@@ -1254,7 +1254,7 @@ void
DepsgraphRelationBuilder::build_animdata_nlastrip_targets(
OperationNode *operation_from,
ListBase *strips)
{
- LISTBASE_FOREACH(NlaStrip *, strip, strips) {
+ LISTBASE_FOREACH (NlaStrip *, strip, strips) {
if (strip->act != NULL) {
build_action(strip->act);
@@ -1986,7 +1986,7 @@ void
DepsgraphRelationBuilder::build_object_data_geometry(Object *object)
ModifierUpdateDepsgraphContext ctx = {};
ctx.scene = scene_;
ctx.object = object;
- LISTBASE_FOREACH(GpencilModifierData *, md,
&object->greasepencil_modifiers) {
+ LISTBASE_FOREACH (GpencilModifierData *, md,
&object->greasepencil_modifiers) {
const GpencilModifierTypeInfo *mti =
BKE_gpencil_modifierType_getInfo((GpencilModifierType)md->type);
if (mti->updateDepsgraph) {
DepsNodeHandle handle =
create_node_handle(obdata_ubereval_key);
@@ -2004,7 +2004,7 @@ void
DepsgraphRelationBuilder::build_object_data_geometry(Object *object)
ModifierUpdateDepsgraphContext ctx = {};
ctx.scene = scene_;
ctx.object = object;
- LISTBASE_FOREACH(ShaderFxData *, fx, &object->shader_fx) {
+ LISTBASE_FOREACH (ShaderFxData *, fx, &object->shader_fx) {
const ShaderFxTypeInfo *fxi =
BKE_shaderfxType_getInfo((ShaderFxType)fx->type);
if (fxi->updateDepsgraph) {
DepsNodeHandle handle =
create_node_handle(obdata_ubereval_key);
diff --git a/source/blender/depsgraph/intern/depsgraph.cc
b/source/blender/depsgraph/intern/depsgraph.cc
index 920a9a65e76..6b1c3384bbe 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -176,7 +176,7 @@ static bool pointer_to_component_node_criteria(
return true;
}
else if (object->pose != NULL) {
- LISTBASE_FOREACH(bPoseChannel *, pchan,
&object->pose->chanbase) {
+ LISTBASE_FOREACH (bPoseChannel *, pchan,
&object->pose->chanbase) {
if (BLI_findindex(&pchan->constraints, con) !=
-1) {
*type = NodeType::BONE;
*operation_code =
OperationCode::BONE_LOCAL;
diff --git a/source/blender/depsgraph/intern/depsgraph_query_filter.cc
b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
index 7af90954d07..c5683c83a20 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_filter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
@@ -200,7 +200,7 @@ Depsgraph *DEG_graph_filter(const Depsgraph *graph_src,
Main *bmain, DEG_FilterQ
GSet *retained_ids = BLI_gset_ptr_new(__func__);
DEG::RetainedIdUserData retained_id_data = {query, retained_ids};
- LISTBASE_FOREACH(DEG_FilterTarget *, target, &query->targets) {
+ LISTBASE_FOREACH (DEG_FilterTarget *, target, &query->targets) {
/* Target Itself */
BLI_gset_add(retained_ids, (void *)target->id);
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index bb4504ceeed..48a909603f4 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -148,7 +148,7 @@ void nested_id_hack_discard_pointers(ID *id_cow)
{
/* Clear the ParticleSettings pointer to prevent
doubly-freeing it. */
Object *ob = (Object *)id_cow;
- LISTBASE_FOREACH(ParticleSystem *, psys,
&ob->particlesystem) {
+ LISTBASE_FOREACH (ParticleSystem *, psys,
&ob->particlesystem) {
psys->part = NULL;
}
break;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index ed73122080b..bac3a4c837f 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -233,7 +233,7 @@ void flush_engine_data_update(ID *id)
if (draw_data_list == NULL) {
return;
}
- LISTBASE_FOREACH(DrawData *, draw_data, draw_data_list) {
+ LISTBASE_FOREACH (DrawData *, draw_data, draw_data_list) {
draw_data->recalc |= id->recalc;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
