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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-10-29 22:46:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-10-29 22:46:45 +0400
commit8f747c49230532b9f1d8e51c41561a2d1a2b8b81 (patch)
treebc34ed011d8a12ce12c3386302041dad80f016c4 /source/blender/blenkernel/intern
parent16d13e0db9d75566735966d81d213958df3ca7e5 (diff)
Code cleanup: use bool instead of int in mask module
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/mask.c18
-rw-r--r--source/blender/blenkernel/intern/scene.c2
-rw-r--r--source/blender/blenkernel/intern/sequencer.c2
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index c856d8cfea4..597cfa5d76e 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1443,7 +1443,7 @@ void BKE_mask_spline_ensure_deform(MaskSpline *spline)
}
}
-void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const int do_newframe)
+void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const bool do_newframe)
{
/* animation if available */
if (do_newframe) {
@@ -1521,7 +1521,7 @@ void BKE_mask_layer_evaluate(MaskLayer *masklay, const float ctime, const int do
}
}
-void BKE_mask_evaluate(Mask *mask, const float ctime, const int do_newframe)
+void BKE_mask_evaluate(Mask *mask, const float ctime, const bool do_newframe)
{
MaskLayer *masklay;
@@ -1562,10 +1562,10 @@ void BKE_mask_update_display(Mask *mask, float ctime)
}
#endif
- BKE_mask_evaluate(mask, ctime, FALSE);
+ BKE_mask_evaluate(mask, ctime, false);
}
-void BKE_mask_evaluate_all_masks(Main *bmain, float ctime, const int do_newframe)
+void BKE_mask_evaluate_all_masks(Main *bmain, float ctime, const bool do_newframe)
{
Mask *mask;
@@ -1835,8 +1835,8 @@ void BKE_mask_layer_shape_sort(MaskLayer *masklay)
BLI_sortlist(&masklay->splines_shapes, mask_layer_shape_sort_cb);
}
-int BKE_mask_layer_shape_spline_from_index(MaskLayer *masklay, int index,
- MaskSpline **r_masklay_shape, int *r_index)
+bool BKE_mask_layer_shape_spline_from_index(MaskLayer *masklay, int index,
+ MaskSpline **r_masklay_shape, int *r_index)
{
MaskSpline *spline;
@@ -1844,12 +1844,12 @@ int BKE_mask_layer_shape_spline_from_index(MaskLayer *masklay, int index,
if (index < spline->tot_point) {
*r_masklay_shape = spline;
*r_index = index;
- return TRUE;
+ return true;
}
index -= spline->tot_point;
}
- return FALSE;
+ return false;
}
int BKE_mask_layer_shape_spline_to_index(MaskLayer *masklay, MaskSpline *spline)
@@ -1891,7 +1891,7 @@ static void interp_weights_uv_v2_apply(const float uv[2], float r_pt[2], const f
/* when a new points added - resize all shapekey array */
void BKE_mask_layer_shape_changed_add(MaskLayer *masklay, int index,
- int do_init, int do_init_interpolate)
+ bool do_init, bool do_init_interpolate)
{
MaskLayerShape *masklay_shape;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d4618e28191..9356536557a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1303,7 +1303,7 @@ void BKE_scene_update_for_newframe(Main *bmain, Scene *sce, unsigned int lay)
* so don't call within 'scene_update_tagged_recursive' */
DAG_scene_update_flags(bmain, sce, lay, TRUE); // only stuff that moves or needs display still
- BKE_mask_evaluate_all_masks(bmain, ctime, TRUE);
+ BKE_mask_evaluate_all_masks(bmain, ctime, true);
/* All 'standard' (i.e. without any dependencies) animation is handled here,
* with an 'local' to 'macro' order of evaluation. This should ensure that
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 925355d9383..1235018546e 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2341,7 +2341,7 @@ static ImBuf *seq_render_mask(SeqRenderData context, Mask *mask, float nr, short
mask_temp = BKE_mask_copy_nolib(mask);
- BKE_mask_evaluate(mask_temp, mask->sfra + nr, TRUE);
+ BKE_mask_evaluate(mask_temp, mask->sfra + nr, true);
maskbuf = MEM_mallocN(sizeof(float) * context.rectx * context.recty, __func__);