Commit: f02af0407fbcb4924a1a1f938629c814259ce086
Author: Campbell Barton
Date: Wed Mar 7 20:46:27 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf02af0407fbcb4924a1a1f938629c814259ce086
Cleanup: use _BEGIN suffix for group iterators
===================================================================
M source/blender/blenkernel/BKE_group.h
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/group.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/writefile.c
M source/blender/collada/SceneExporter.cpp
M source/blender/editors/object/object_relations.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/render/intern/source/convertblender.c
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
M source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
diff --git a/source/blender/blenkernel/BKE_group.h
b/source/blender/blenkernel/BKE_group.h
index 74255cfc941..6f7ced403a2 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -62,7 +62,7 @@ void BKE_group_eval_view_layers(const struct
EvaluationContext *eval_ctx,
/* Helper macros. */
-#define FOREACH_GROUP_BASE(_group, _base) \
+#define FOREACH_GROUP_BASE_BEGIN(_group, _base) \
for (Base *_base = (Base *)(_group)->view_layer->object_bases.first; \
_base; \
_base = _base->next) \
@@ -71,7 +71,7 @@ void BKE_group_eval_view_layers(const struct
EvaluationContext *eval_ctx,
#define FOREACH_GROUP_BASE_END \
}
-#define FOREACH_GROUP_OBJECT(_group, _object) \
+#define FOREACH_GROUP_OBJECT_BEGIN(_group, _object) \
for (Base *_base = (Base *)(_group)->view_layer->object_bases.first; \
_base; \
_base = _base->next) \
diff --git a/source/blender/blenkernel/intern/collision.c
b/source/blender/blenkernel/intern/collision.c
index 21945f07a10..55ded96fe01 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -506,7 +506,7 @@ static void add_collision_object(Object ***objs, unsigned
int *numobj, unsigned
Group *group= ob->dup_group;
/* add objects */
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
add_collision_object(objs, numobj, maxobj, object,
self, level+1, modifier_type);
}
@@ -527,7 +527,7 @@ Object **get_collisionobjects_ext(Scene *scene, Object
*self, Group *group, unsi
/* gather all collision objects */
if (group) {
/* use specified group */
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
add_collision_object(&objs, &numobj, &maxobj, object,
self, level, modifier_type);
}
@@ -584,7 +584,7 @@ static void add_collider_cache_object(ListBase **objs,
Object *ob, Object *self,
Group *group= ob->dup_group;
/* add objects */
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
add_collider_cache_object(objs, object, self, level+1);
}
@@ -598,7 +598,7 @@ ListBase *get_collider_cache(Scene *scene, Object *self,
Group *group)
/* add object in same layer in scene */
if (group) {
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
add_collider_cache_object(&objs, object, self, 0);
}
diff --git a/source/blender/blenkernel/intern/group.c
b/source/blender/blenkernel/intern/group.c
index 8fa8da8b0ca..c5cea750b53 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -213,7 +213,7 @@ static bool group_object_cyclic_check_internal(Object
*object, Group *group)
if (dup_group == group)
return true;
else {
- FOREACH_GROUP_OBJECT(dup_group, group_object)
+ FOREACH_GROUP_OBJECT_BEGIN(dup_group, group_object)
{
if
(group_object_cyclic_check_internal(group_object, dup_group)) {
return true;
@@ -278,7 +278,7 @@ Group *BKE_group_object_find(Group *group, Object *ob)
bool BKE_group_is_animated(Group *group, Object *UNUSED(parent))
{
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
if (object->proxy) {
return true;
@@ -369,7 +369,7 @@ void BKE_group_handle_recalc_and_update(const struct
EvaluationContext *eval_ctx
#endif
{
/* only do existing tags, as set by regular depsgraph */
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
if (object->id.recalc & ID_RECALC_ALL) {
BKE_object_handle_update(eval_ctx, scene,
object);
diff --git a/source/blender/blenkernel/intern/library_query.c
b/source/blender/blenkernel/intern/library_query.c
index e49c691448b..2a5c8f955ab 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -765,7 +765,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id,
LibraryIDLinkCallback call
case ID_GR:
{
Group *group = (Group *) id;
- FOREACH_GROUP_BASE(group, base)
+ FOREACH_GROUP_BASE_BEGIN(group, base)
{
CALLBACK_INVOKE(base->object,
IDWALK_CB_USER_ONE);
}
diff --git a/source/blender/blenkernel/intern/object_dupli.c
b/source/blender/blenkernel/intern/object_dupli.c
index 2d655913b3e..391be751ae0 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -246,7 +246,7 @@ static void make_child_duplis(const DupliContext *ctx, void
*userdata, MakeChild
if (ctx->group) {
int groupid = 0;
- FOREACH_GROUP_BASE(ctx->group, base)
+ FOREACH_GROUP_BASE_BEGIN(ctx->group, base)
{
Object *ob = base->object;
if ((base->flag & BASE_VISIBLED) && ob != ctx->obedit
&& is_child(ob, parent)) {
@@ -932,7 +932,7 @@ static void make_duplis_particle_system(const DupliContext
*ctx, ParticleSystem
totgroup += dw->count;
}
else {
- FOREACH_GROUP_OBJECT(part->dup_group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(part->dup_group,
object)
{
(void) object;
totgroup++;
@@ -957,7 +957,7 @@ static void make_duplis_particle_system(const DupliContext
*ctx, ParticleSystem
}
else {
a = 0;
- FOREACH_GROUP_OBJECT(part->dup_group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(part->dup_group,
object)
{
oblist[a] = object;
obcopylist[a] = *object;
@@ -1057,7 +1057,7 @@ static void make_duplis_particle_system(const
DupliContext *ctx, ParticleSystem
if (part->ren_as == PART_DRAW_GR && psys->part->draw &
PART_DRAW_WHOLE_GR) {
b = 0;
- FOREACH_GROUP_OBJECT(part->dup_group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(part->dup_group,
object)
{
copy_m4_m4(tmat, oblist[b]->obmat);
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index c9507ac1a36..e90fa299f44 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -351,7 +351,7 @@ void psys_check_group_weights(ParticleSettings *part)
}
/* then add objects in the group to new list */
- FOREACH_GROUP_OBJECT(part->dup_group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(part->dup_group, object)
{
dw = part->dupliweights.first;
while (dw && dw->ob != object) {
diff --git a/source/blender/blenkernel/intern/rigidbody.c
b/source/blender/blenkernel/intern/rigidbody.c
index 011971b6677..d61cb0c9369 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -92,7 +92,7 @@ void BKE_rigidbody_free_world(RigidBodyWorld *rbw)
if (rbw->physics_world) {
/* free physics references, we assume that all physics objects
in will have been added to the world */
if (rbw->constraints) {
- FOREACH_GROUP_OBJECT(rbw->constraints, object)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->constraints, object)
{
if (object->rigidbody_constraint) {
RigidBodyCon *rbc =
object->rigidbody_constraint;
@@ -105,7 +105,7 @@ void BKE_rigidbody_free_world(RigidBodyWorld *rbw)
}
if (rbw->group) {
- FOREACH_GROUP_OBJECT(rbw->group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->group, object)
{
if (object->rigidbody_object) {
RigidBodyOb *rbo =
object->rigidbody_object;
@@ -1148,7 +1148,7 @@ void BKE_rigidbody_remove_object(Scene *scene, Object *ob)
/* remove object from rigid body constraints */
if (rbw->constraints) {
- FOREACH_GROUP_OBJECT(rbw->constraints, obt)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->constraints, obt)
{
if (obt && obt->rigidbody_constraint) {
rbc = obt->rigidbody_constraint;
@@ -1201,7 +1201,7 @@ static void rigidbody_update_ob_array(RigidBodyWorld *rbw)
}
i = 0;
- FOREACH_GROUP_OBJECT(rbw->group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->group, object)
{
rbw->objects[i] = object;
i++;
@@ -1332,7 +1332,7 @@ static void rigidbody_update_simulation(const struct
EvaluationContext *eval_ctx
* Memory management needs redesign here, this is just a dirty
workaround.
*/
if (rebuild && rbw->constraints) {
- FOREACH_GROUP_OBJECT(rbw->constraints, ob)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->constraints, ob)
{
RigidBodyCon *rbc = ob->rigidbody_constraint;
if (rbc && rbc->physics_constraint) {
@@ -1345,7 +1345,7 @@ static void rigidbody_update_simulation(const struct
EvaluationContext *eval_ctx
}
/* update objects */
- FOREACH_GROUP_OBJECT(rbw->group, ob)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->group, ob)
{
if (ob->type == OB_MESH) {
/* validate that we've got valid object set up here...
*/
@@ -1394,7 +1394,7 @@ static void rigidbody_update_simulation(const struct
EvaluationContext *eval_ctx
if (rbw->constraints == NULL) /* no constraints, move on */
return;
- FOREACH_GROUP_OBJECT(rbw->constraints, ob)
+ FOREACH_GROUP_OBJECT_BEGIN(rbw->constraints, ob)
{
/* validate that we've got valid object set up here... */
RigidBodyCon *rbc = ob->rigidbody_constraint;
@@ -1427,7 +1427,7 @@ static void rigidbody_update_simulation(const struct
EvaluationContext *eval_ctx
static void rigidbody_update_simulation_post_step(RigidBodyWorld *rbw)
{
- FOREACH_GROUP_BASE(rbw->group, base)
+ FOREACH_GROUP_BASE_BEGIN(rbw->group, base)
{
Object *ob = base->object;
RigidBodyOb *rbo = ob->rigidbody_object;
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 512ce79e21c..9a570ad0e46 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -961,7 +961,7 @@ void BKE_scene_set_background(Main *bmain, Scene *scene)
/* group flags again */
for (group = bmain->group.first; group; group = group->id.next) {
- FOREACH_GROUP_OBJECT(group, object)
+ FOREACH_GROUP_OBJECT_BEGIN(group, object)
{
object->flag |= OB_FROMGROUP;
}
diff --git a/source/blender/blenloader/intern/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
