[Bf-blender-cvs] [63caaa2] master: Code Cleanup: rename vars for detecting change to be more consistent
Campbell Barton
noreply at git.blender.org
Mon Nov 25 20:40:48 CET 2013
Commit: 63caaa2b12edf0e0a47764156416fac9d43d3664
Author: Campbell Barton
Date: Tue Nov 26 06:39:14 2013 +1100
http://developer.blender.org/rB63caaa2b12edf0e0a47764156416fac9d43d3664
Code Cleanup: rename vars for detecting change to be more consistent
rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenlib/intern/rct.c
M source/blender/bmesh/operators/bmo_bridge.c
M source/blender/bmesh/operators/bmo_fill_grid.c
M source/blender/bmesh/operators/bmo_subdivide_edgering.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/armature/editarmature_retarget.c
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/gpencil/editaction_gpencil.c
M source/blender/editors/include/ED_mask.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/mask/mask_editaction.c
M source/blender/editors/mask/mask_ops.c
M source/blender/editors/mask/mask_select.c
M source/blender/editors/mask/mask_shapekey.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/rigidbody_constraint.c
M source/blender/editors/physics/rigidbody_object.c
M source/blender/editors/screen/area.c
M source/blender/editors/sculpt_paint/paint_hide.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_clip/clip_dopesheet_ops.c
M source/blender/editors/space_clip/clip_graph_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_clip/tracking_select.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_info/info_report.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_ruler.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_snap.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index ced0209..eda905a 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -476,7 +476,7 @@ void nodeClearActiveID(struct bNodeTree *ntree, short idtype);
struct bNode *nodeGetActiveTexture(struct bNodeTree *ntree);
void nodeUpdate(struct bNodeTree *ntree, struct bNode *node);
-int nodeUpdateID(struct bNodeTree *ntree, struct ID *id);
+bool nodeUpdateID(struct bNodeTree *ntree, struct ID *id);
void nodeUpdateInternalLinks(struct bNodeTree *ntree, struct bNode *node);
void nodeSynchronizeID(struct bNode *node, bool copy_to_id);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 731196c..5c98fe4 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3315,7 +3315,7 @@ bool DM_is_valid(DerivedMesh *dm)
const bool do_fixes = false;
bool is_valid = true;
- bool is_change = true;
+ bool changed = true;
is_valid &= BKE_mesh_validate_all_customdata(
dm->getVertDataLayout(dm),
@@ -3323,7 +3323,7 @@ bool DM_is_valid(DerivedMesh *dm)
dm->getLoopDataLayout(dm),
dm->getPolyDataLayout(dm),
0, /* setting mask here isn't useful, gives false positives */
- do_verbose, do_fixes, &is_change);
+ do_verbose, do_fixes, &changed);
is_valid &= BKE_mesh_validate_arrays(
NULL,
@@ -3333,9 +3333,9 @@ bool DM_is_valid(DerivedMesh *dm)
dm->getLoopArray(dm), dm->getNumLoops(dm),
dm->getPolyArray(dm), dm->getNumPolys(dm),
dm->getVertDataArray(dm, CD_MDEFORMVERT),
- do_verbose, do_fixes, &is_change);
+ do_verbose, do_fixes, &changed);
- BLI_assert(is_change == false);
+ BLI_assert(changed == false);
return is_valid;
}
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3be80a7..0267c9a 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -335,15 +335,15 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
* - otherwise, just append to end
*/
if (extension[0]) {
- int change = 1;
+ bool changed = true;
- while (change) { /* remove extensions */
- change = 0;
+ while (changed) { /* remove extensions */
+ changed = false;
if (len > 2 && basename[len - 2] == '.') {
if (basename[len - 1] == 'L' || basename[len - 1] == 'R') { /* L R */
basename[len - 2] = '\0';
len -= 2;
- change = 1;
+ changed = true;
}
}
else if (len > 3 && basename[len - 3] == '.') {
@@ -352,7 +352,7 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
{
basename[len - 3] = '\0';
len -= 3;
- change = 1;
+ changed = true;
}
}
else if (len > 4 && basename[len - 4] == '.') {
@@ -361,7 +361,7 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
{
basename[len - 4] = '\0';
len -= 4;
- change = 1;
+ changed = true;
}
}
}
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index bcf0eaf..bdc70ed 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3658,30 +3658,30 @@ bool BKE_nurb_check_valid_v(struct Nurb *nu)
bool BKE_nurb_order_clamp_u(struct Nurb *nu)
{
- bool change = false;
+ bool changed = false;
if (nu->pntsu < nu->orderu) {
nu->orderu = nu->pntsu;
- change = true;
+ changed = true;
}
if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) {
CLAMP(nu->orderu, 3, 4);
- change = true;
+ changed = true;
}
- return change;
+ return changed;
}
bool BKE_nurb_order_clamp_v(struct Nurb *nu)
{
- bool change = false;
+ bool changed = false;
if (nu->pntsv < nu->orderv) {
nu->orderv = nu->pntsv;
- change = true;
+ changed = true;
}
if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) {
CLAMP(nu->orderv, 3, 4);
- change = true;
+ changed = true;
}
- return change;
+ return changed;
}
bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles)
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8a74f47..a7d87fa 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1296,7 +1296,7 @@ bool CustomData_merge(const struct CustomData *source, struct CustomData *dest,
CustomDataLayer *layer, *newlayer;
void *data;
int i, type, number = 0, lasttype = -1, lastactive = 0, lastrender = 0, lastclone = 0, lastmask = 0, lastflag = 0;
- bool change = false;
+ bool changed = false;
for (i = 0; i < source->totlayer; ++i) {
layer = &source->layers[i];
@@ -1346,12 +1346,12 @@ bool CustomData_merge(const struct CustomData *source, struct CustomData *dest,
newlayer->active_clone = lastclone;
newlayer->active_mask = lastmask;
newlayer->flag |= lastflag & (CD_FLAG_EXTERNAL | CD_FLAG_IN_MEMORY);
- change = true;
+ changed = true;
}
}
CustomData_update_typemap(dest);
- return change;
+ return changed;
}
void CustomData_copy(const struct CustomData *source, struct CustomData *dest,
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index cb7b4a3..6ef20ec 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1466,7 +1466,8 @@ static void flush_update_node(Main *bmain, DagNode *node, unsigned int layer, in
{
DagAdjList *itA;
Object *ob, *obc;
- int oldflag, changed = 0;
+ int oldflag;
+ bool changed = false;
unsigned int all_layer;
node->lasttime = curtime;
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 689d0a2..3ce44dc 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -61,7 +61,7 @@
bool free_gpencil_strokes(bGPDframe *gpf)
{
bGPDstroke *gps, *gpsn;
- bool modified = gpf->strokes.first != NULL;
+ bool changed = (gpf->strokes.first != NULL);
/* error checking */
if (gpf == NULL)
@@ -76,7 +76,7 @@ bool free_gpencil_strokes(bGPDframe *gpf)
BLI_freelinkN(&gpf->strokes, gps);
}
- return modified;
+ return changed;
}
/* Free all of a gp-layer's frames */
@@ -473,18 +473,18 @@ bGPDframe *gpencil_layer_getframe(bGPDlayer *gpl, int cframe, short addnew)
/* delete the given frame from a layer */
bool gpencil_layer_delframe(bGPDlayer *gpl, bGPDframe *gpf)
{
- bool modified = false;
+ bool changed = false;
/* error checking */
if (ELEM(NULL, gpl, gpf))
return false;
/* free the frame and its data */
- modified = free_gpencil_strokes(gpf);
+ changed = free_gpencil_strokes(gpf);
BLI_freelinkN(&gpl->frames, gpf);
gpl->actframe = NULL;
- return modified;
+ return changed;
}
/* get the active gp-layer for editing */
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 214c49b..6097e05 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1815,13 +1815,13 @@ MaskLayerShape *BKE_mask_layer_shape_duplicate(MaskLayerShape *masklay_shape)
bool BKE_mask_layer_shape_unlink(MaskLayer *masklay, MaskLayerShape *masklay_shape)
{
- bool modified = masklay_shape != NULL;
+ bool changed = (masklay_shape != NULL);
BLI_remlink(&masklay->splines_shapes, masklay_shape);
BKE_mask_layer_shape_free(masklay_shape);
- return modified;
+ return changed;
}
static int mask_layer_shape_sort_cb(void *masklay_shape_a_ptr, void *masklay_shape_b_ptr)
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 83c257d..1128c3e 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -2375,7 +2375,7 @@ bool BKE_mball_minmax_ex(MetaBall *mb, float min[3], float max[3],
{
const float scale = obmat ? mat4_to_scale(obmat) : 1.0f;
MetaElem *ml;
- bool change = false;
+ bool changed = false;
float centroid[3], vec[3];
INIT_MINMAX(min, max);
@@ -2398,11 +2398,11 @@ bool BKE_mball_minmax_ex(MetaBall *mb, float min[3], float max[3],
add_v3_fl(vec, scale_mb * i);
minmax_v3v3_v3(min, max, vec);
}
- change = true;
+ changed = true;
}
}
- return change;
+ return changed;
}
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index a4f5529..ad6a2de 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -216,7 +216,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
MPoly *mpolys, unsigned int totpoly,
MDeformVert *dverts, /* assume totvert length */
const bool do_verbose, const bool do_fixes,
- bool *r_change)
+ bool *r_changed)
{
# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = true; } (void)0
# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
@@ -854,7 +854,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh,
PRINT_MSG("%s: finished\n\n", __func__);
- *r_change = (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed);
+ *r_changed = (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed);
return is_valid;
}
@@ -963,7 +963,7 @@ bool BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata,
int BKE_mesh_validate(Mesh *me, const int do_verbose)
{
bool is_valid = true;
- bool is_change;
+ bool changed;
if (do_verbose) {
printf("MESH: %s\n", me->id.name + 2);
@@ -973,7 +973,7 @@ int BKE_mesh_validate(Mesh *me, const int do_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list