Cleanup: Remove BLI_ prefix from listbase macro

This is kind of doesn't matter where macro itself is defined.

We should stick to the following:

- If some macro is actually more an inline function, follow regular
  function name conventions.
- If macro is a macro, type it in capitals. Use module prefix if that
  helps readability or it if helps avoiding accidents.
This commit is contained in:
Sergey Sharybin 2018-02-15 12:38:21 +01:00
parent 6d4022f619
commit c0bbc4abf5
10 changed files with 51 additions and 51 deletions

View File

@ -103,32 +103,32 @@ struct LinkData *BLI_genericNodeN(void *data);
*
* \code{.c}
*
* BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN (listbase, item, item_init) {
* LISTBASE_CIRCULAR_FORWARD_BEGIN (listbase, item, item_init) {
* ...operate on marker...
* }
* BLI_LISTBASE_CIRCULAR_FORWARD_END (listbase, item, item_init);
* LISTBASE_CIRCULAR_FORWARD_END (listbase, item, item_init);
*
* \endcode
*/
#define BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN(lb, lb_iter, lb_init) \
#define LISTBASE_CIRCULAR_FORWARD_BEGIN(lb, lb_iter, lb_init) \
if ((lb)->first && (lb_init || (lb_init = (lb)->first))) { \
lb_iter = lb_init; \
do {
#define BLI_LISTBASE_CIRCULAR_FORWARD_END(lb, lb_iter, lb_init) \
#define LISTBASE_CIRCULAR_FORWARD_END(lb, lb_iter, lb_init) \
} while ((lb_iter = (lb_iter)->next ? (lb_iter)->next : (lb)->first), \
(lb_iter != lb_init)); \
}
#define BLI_LISTBASE_CIRCULAR_BACKWARD_BEGIN(lb, lb_iter, lb_init) \
#define LISTBASE_CIRCULAR_BACKWARD_BEGIN(lb, lb_iter, lb_init) \
if ((lb)->last && (lb_init || (lb_init = (lb)->last))) { \
lb_iter = lb_init; \
do {
#define BLI_LISTBASE_CIRCULAR_BACKWARD_END(lb, lb_iter, lb_init) \
#define LISTBASE_CIRCULAR_BACKWARD_END(lb, lb_iter, lb_init) \
} while ((lb_iter = (lb_iter)->prev ? (lb_iter)->prev : (lb)->last), \
(lb_iter != lb_init)); \
}
#define BLI_LISTBASE_FOREACH(type, var, list) \
#define LISTBASE_FOREACH(type, var, list) \
for (type var = (type)((list)->first); \
var != NULL; \
var = (type)(((Link*)(var))->next))

View File

@ -305,7 +305,7 @@ void DepsgraphNodeBuilder::build_group(Base *base, Group *group)
}
group_id->tag |= LIB_TAG_DOIT;
BLI_LISTBASE_FOREACH (GroupObject *, go, &group->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &group->gobject) {
build_object(base, go->ob);
}
}
@ -524,7 +524,7 @@ void DepsgraphNodeBuilder::build_animdata(ID *id)
}
/* drivers */
BLI_LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
/* create driver */
build_driver(id, fcu);
}
@ -630,7 +630,7 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene)
/* objects - simulation participants */
if (rbw->group) {
BLI_LISTBASE_FOREACH (GroupObject *, go, &rbw->group->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &rbw->group->gobject) {
Object *object = go->ob;
if (!object || (object->type != OB_MESH))
@ -671,7 +671,7 @@ void DepsgraphNodeBuilder::build_particles(Object *object)
object),
DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
/* Build all particle systems. */
BLI_LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
ParticleSettings *part = psys->part;
/* Particle settings. */
// XXX: what if this is used more than once!
@ -766,7 +766,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *object)
// TODO: "Done" operation
/* Cloth modifier. */
BLI_LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
if (md->type == eModifierType_Cloth) {
build_cloth(object);
}
@ -970,7 +970,7 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
op_node->set_as_exit();
/* nodetree's nodes... */
BLI_LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
ID *id = bnode->id;
if (id == NULL) {
continue;

View File

@ -195,7 +195,7 @@ void DepsgraphNodeBuilder::build_rig(Object *object)
op_node->set_as_exit();
/* bones */
BLI_LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
/* Node for bone evaluation. */
op_node = add_operation_node(&object->id, DEG_NODE_TYPE_BONE, pchan->name, NULL,
DEG_OPCODE_BONE_LOCAL);
@ -236,7 +236,7 @@ void DepsgraphNodeBuilder::build_rig(Object *object)
* - Care is needed to ensure that multi-headed trees work out the same as in ik-tree building
* - Animated chain-lengths are a problem...
*/
BLI_LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) {
LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) {
switch (con->type) {
case CONSTRAINT_TYPE_KINEMATIC:
build_ik_pose(object, pchan, con);
@ -275,7 +275,7 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *object)
op_node->set_as_entry();
BLI_LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
op_node = add_operation_node(&object->id, DEG_NODE_TYPE_BONE, pchan->name,
NULL, DEG_OPCODE_BONE_LOCAL);
op_node->set_as_entry();

View File

@ -78,7 +78,7 @@ void DepsgraphNodeBuilder::build_scene(Scene *scene)
/* Setup currently building context. */
scene_ = scene;
/* scene objects */
BLI_LISTBASE_FOREACH (Base *, base, &scene->base) {
LISTBASE_FOREACH (Base *, base, &scene->base) {
Object *object = base->object;
build_object(base, object);
}
@ -103,15 +103,15 @@ void DepsgraphNodeBuilder::build_scene(Scene *scene)
build_gpencil(scene->gpd);
}
/* Cache file. */
BLI_LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
build_cachefile(cachefile);
}
/* Masks. */
BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
build_mask(mask);
}
/* Movie clips. */
BLI_LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
build_movieclip(clip);
}
/* Parameters evaluation for scene relations mainly. */

View File

@ -193,7 +193,7 @@ static bool particle_system_depends_on_time(ParticleSystem *psys)
static bool object_particles_depends_on_time(Object *object)
{
BLI_LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
if (particle_system_depends_on_time(psys)) {
return true;
}
@ -349,7 +349,7 @@ void DepsgraphRelationBuilder::add_forcefield_relations(
{
ListBase *effectors = pdInitEffectors(scene, object, psys, eff, false);
if (effectors != NULL) {
BLI_LISTBASE_FOREACH(EffectorCache *, eff, effectors) {
LISTBASE_FOREACH(EffectorCache *, eff, effectors) {
if (eff->ob != object) {
ComponentKey eff_key(&eff->ob->id, DEG_NODE_TYPE_TRANSFORM);
add_relation(eff_key, key, name);
@ -429,7 +429,7 @@ void DepsgraphRelationBuilder::build_group(Object *object, Group *group)
OperationKey object_local_transform_key(object != NULL ? &object->id : NULL,
DEG_NODE_TYPE_TRANSFORM,
DEG_OPCODE_TRANSFORM_LOCAL);
BLI_LISTBASE_FOREACH (GroupObject *, go, &group->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &group->gobject) {
if (!group_done) {
build_object(go->ob);
}
@ -755,7 +755,7 @@ void DepsgraphRelationBuilder::build_constraints(ID *id,
else if (cti->get_constraint_targets) {
ListBase targets = {NULL, NULL};
cti->get_constraint_targets(con, &targets);
BLI_LISTBASE_FOREACH (bConstraintTarget *, ct, &targets) {
LISTBASE_FOREACH (bConstraintTarget *, ct, &targets) {
if (ct->tar == NULL) {
continue;
}
@ -932,7 +932,7 @@ void DepsgraphRelationBuilder::build_animdata_curves(ID *id)
operation_from,
&adt->action->curves);
}
BLI_LISTBASE_FOREACH(NlaTrack *, nlt, &adt->nla_tracks) {
LISTBASE_FOREACH(NlaTrack *, nlt, &adt->nla_tracks) {
build_animdata_nlastrip_targets(id, adt_key,
operation_from,
&nlt->strips);
@ -947,7 +947,7 @@ void DepsgraphRelationBuilder::build_animdata_curves_targets(
/* Iterate over all curves and build relations. */
PointerRNA id_ptr;
RNA_id_pointer_create(id, &id_ptr);
BLI_LISTBASE_FOREACH(FCurve *, fcu, curves) {
LISTBASE_FOREACH(FCurve *, fcu, curves) {
PointerRNA ptr;
PropertyRNA *prop;
int index;
@ -983,7 +983,7 @@ void DepsgraphRelationBuilder::build_animdata_nlastrip_targets(
OperationDepsNode *operation_from,
ListBase *strips)
{
BLI_LISTBASE_FOREACH(NlaStrip *, strip, strips) {
LISTBASE_FOREACH(NlaStrip *, strip, strips) {
if (strip->act != NULL) {
build_animdata_curves_targets(id, adt_key,
operation_from,
@ -1004,7 +1004,7 @@ void DepsgraphRelationBuilder::build_animdata_drivers(ID *id)
return;
}
ComponentKey adt_key(id, DEG_NODE_TYPE_ANIMATION);
BLI_LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
OperationKey driver_key(id,
DEG_NODE_TYPE_PARAMETERS,
DEG_OPCODE_DRIVER,
@ -1028,7 +1028,7 @@ void DepsgraphRelationBuilder::build_animdata_drivers(ID *id)
*/
if (fcu->array_index > 0) {
FCurve *fcu_prev = NULL;
BLI_LISTBASE_FOREACH (FCurve *, fcu_candidate, &adt->drivers) {
LISTBASE_FOREACH (FCurve *, fcu_candidate, &adt->drivers) {
/* Writing to different RNA paths is */
const char *rna_path = fcu->rna_path ? fcu->rna_path : "";
if (!STREQ(fcu_candidate->rna_path, rna_path)) {
@ -1158,7 +1158,7 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu)
const char *rna_path = fcu->rna_path ? fcu->rna_path : "";
const RNAPathKey self_key(id, rna_path);
BLI_LISTBASE_FOREACH (DriverVar *, dvar, &driver->variables) {
LISTBASE_FOREACH (DriverVar *, dvar, &driver->variables) {
/* Only used targets. */
DRIVER_TARGETS_USED_LOOPER(dvar)
{
@ -1273,7 +1273,7 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene *scene)
/* objects - simulation participants */
if (rbw->group) {
BLI_LISTBASE_FOREACH (GroupObject *, go, &rbw->group->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &rbw->group->gobject) {
Object *object = go->ob;
if (object == NULL || object->type != OB_MESH) {
continue;
@ -1327,7 +1327,7 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene *scene)
/* constraints */
if (rbw->constraints) {
BLI_LISTBASE_FOREACH (GroupObject *, go, &rbw->constraints->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &rbw->constraints->gobject) {
Object *object = go->ob;
if (object == NULL || !object->rigidbody_constraint) {
continue;
@ -1363,7 +1363,7 @@ void DepsgraphRelationBuilder::build_particles(Object *object)
DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
/* Particle systems. */
BLI_LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
ParticleSettings *part = psys->part;
/* Animation of particle settings, */
build_animdata(&part->id);
@ -1409,8 +1409,8 @@ void DepsgraphRelationBuilder::build_particles(Object *object)
"Particle Field");
/* Boids. */
if (part->boids) {
BLI_LISTBASE_FOREACH (BoidState *, state, &part->boids->states) {
BLI_LISTBASE_FOREACH (BoidRule *, rule, &state->rules) {
LISTBASE_FOREACH (BoidState *, state, &part->boids->states) {
LISTBASE_FOREACH (BoidRule *, rule, &state->rules) {
Object *ruleob = NULL;
if (rule->type == eBoidRuleType_Avoid) {
ruleob = ((BoidRuleGoalAvoid *)rule)->ob;
@ -1441,7 +1441,7 @@ void DepsgraphRelationBuilder::build_particles(Object *object)
case PART_DRAW_GR:
if (part->dup_group != NULL) {
build_group(NULL, part->dup_group);
BLI_LISTBASE_FOREACH (GroupObject *, go, &part->dup_group->gobject) {
LISTBASE_FOREACH (GroupObject *, go, &part->dup_group->gobject) {
build_particles_visualization_object(object,
psys,
go->ob);
@ -1563,7 +1563,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
DEG_NODE_TYPE_GEOMETRY,
DEG_OPCODE_GEOMETRY_UBEREVAL);
BLI_LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
const ModifierTypeInfo *mti = modifierType_getInfo((ModifierType)md->type);
if (mti->updateDepsgraph) {
DepsNodeHandle handle = create_node_handle(obdata_ubereval_key);
@ -1756,7 +1756,7 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
DEG_OPCODE_PARAMETERS_EVAL);
/* nodetree's nodes... */
BLI_LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) {
ID *id = bnode->id;
if (id == NULL) {
continue;

View File

@ -341,8 +341,8 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
*/
RootPChanMap root_map;
bool pose_depends_on_local_transform = false;
BLI_LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
BLI_LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) {
switch (con->type) {
case CONSTRAINT_TYPE_KINEMATIC:
build_ik_pose(object, pchan, con, &root_map);
@ -382,7 +382,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
}
/* links between operations for each bone */
BLI_LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
OperationKey bone_local_key(&object->id, DEG_NODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_LOCAL);
OperationKey bone_pose_key(&object->id, DEG_NODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_POSE_PARENT);
OperationKey bone_ready_key(&object->id, DEG_NODE_TYPE_BONE, pchan->name, DEG_OPCODE_BONE_READY);
@ -451,7 +451,7 @@ void DepsgraphRelationBuilder::build_proxy_rig(Object *object)
OperationKey pose_done_key(&object->id,
DEG_NODE_TYPE_EVAL_POSE,
DEG_OPCODE_POSE_DONE);
BLI_LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
OperationKey bone_local_key(&object->id,
DEG_NODE_TYPE_BONE, pchan->name,
DEG_OPCODE_BONE_LOCAL);

View File

@ -76,7 +76,7 @@ void DepsgraphRelationBuilder::build_scene(Scene *scene)
/* Setup currently building context. */
scene_ = scene;
/* Scene objects. */
BLI_LISTBASE_FOREACH (Base *, base, &scene->base) {
LISTBASE_FOREACH (Base *, base, &scene->base) {
Object *object = base->object;
build_object(object);
}
@ -101,11 +101,11 @@ void DepsgraphRelationBuilder::build_scene(Scene *scene)
build_gpencil(scene->gpd);
}
/* Masks. */
BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
build_mask(mask);
}
/* Movie clips. */
BLI_LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
build_movieclip(clip);
}
for (Depsgraph::OperationNodes::const_iterator it_op = graph_->operations.begin();

View File

@ -155,7 +155,7 @@ static bool pointer_to_component_node_criteria(
return true;
}
else if (object->pose != NULL) {
BLI_LISTBASE_FOREACH(bPoseChannel *, pchan, &object->pose->chanbase) {
LISTBASE_FOREACH(bPoseChannel *, pchan, &object->pose->chanbase) {
if (BLI_findindex(&pchan->constraints, con) != -1) {
/* bone transforms */
*type = DEG_NODE_TYPE_BONE;

View File

@ -328,12 +328,12 @@ void DEG_graph_on_visible_update(Main *bmain, Scene *scene)
return;
}
/* Special trick to get local view to work. */
BLI_LISTBASE_FOREACH (Base *, base, &scene->base) {
LISTBASE_FOREACH (Base *, base, &scene->base) {
Object *object = base->object;
DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
id_node->layers = 0;
}
BLI_LISTBASE_FOREACH (Base *, base, &scene->base) {
LISTBASE_FOREACH (Base *, base, &scene->base) {
Object *object = base->object;
DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
id_node->layers |= base->lay;
@ -343,7 +343,7 @@ void DEG_graph_on_visible_update(Main *bmain, Scene *scene)
}
}
DEG::deg_graph_build_flush_layers(graph);
BLI_LISTBASE_FOREACH (Base *, base, &scene->base) {
LISTBASE_FOREACH (Base *, base, &scene->base) {
Object *object = base->object;
DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
GHASH_FOREACH_BEGIN(DEG::ComponentDepsNode *, comp, id_node->components)

View File

@ -1095,14 +1095,14 @@ static void select_timeline_marker_frame(ListBase *markers, int frame, bool exte
}
}
BLI_LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_first) {
LISTBASE_CIRCULAR_FORWARD_BEGIN (markers, marker, marker_first) {
/* this way a not-extend select will always give 1 selected marker */
if (marker->frame == frame) {
marker->flag ^= SELECT;
break;
}
}
BLI_LISTBASE_CIRCULAR_FORWARD_END (markers, marker, marker_first);
LISTBASE_CIRCULAR_FORWARD_END (markers, marker, marker_first);
}
static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool camera)