[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61000] trunk/blender/source/blender: Code cleanup: use bool instead of int in mask module
Sergey Sharybin
sergey.vfx at gmail.com
Tue Oct 29 19:46:45 CET 2013
Revision: 61000
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61000
Author: nazgul
Date: 2013-10-29 18:46:45 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
Code cleanup: use bool instead of int in mask module
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mask.h
trunk/blender/source/blender/blenkernel/intern/mask.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
trunk/blender/source/blender/editors/mask/mask_add.c
trunk/blender/source/blender/editors/mask/mask_shapekey.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h 2013-10-29 18:46:45 UTC (rev 61000)
@@ -123,9 +123,9 @@
void BKE_mask_update_display(struct Mask *mask, float ctime);
-void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe);
-void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe);
-void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const int do_newframe);
+void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const bool do_newframe);
+void BKE_mask_evaluate(struct Mask *mask, const float ctime, const bool do_newframe);
+void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const bool do_newframe);
void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene);
void BKE_mask_parent_init(struct MaskParent *parent);
void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
@@ -161,12 +161,13 @@
void BKE_mask_layer_shape_unlink(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
void BKE_mask_layer_shape_sort(struct MaskLayer *masklay);
-int BKE_mask_layer_shape_spline_from_index(struct MaskLayer *masklay, int index,
+bool BKE_mask_layer_shape_spline_from_index(struct MaskLayer *masklay, int index,
struct MaskSpline **r_masklay_shape, int *r_index);
int BKE_mask_layer_shape_spline_to_index(struct MaskLayer *masklay, struct MaskSpline *spline);
+/* TODO(sergey): do_init and do_init_interpolate are always true, so let's wipe them later. */
void BKE_mask_layer_shape_changed_add(struct MaskLayer *masklay, int index,
- int do_init, int do_init_interpolate);
+ bool do_init, bool do_init_interpolate);
void BKE_mask_layer_shape_changed_remove(struct MaskLayer *masklay, int index, int count);
Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -1443,7 +1443,7 @@
}
}
-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_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 @@
}
#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 @@
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 @@
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 @@
/* 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;
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -1303,7 +1303,7 @@
* 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
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -2341,7 +2341,7 @@
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__);
Modified: trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/compositor/operations/COM_MaskOperation.cpp 2013-10-29 18:46:45 UTC (rev 61000)
@@ -84,7 +84,7 @@
this->m_rasterMaskHandles[i] = BKE_maskrasterize_handle_new();
/* re-eval frame info */
- BKE_mask_evaluate(mask_temp, frame_iter, TRUE);
+ BKE_mask_evaluate(mask_temp, frame_iter, true);
BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[i], mask_temp,
this->m_maskWidth, this->m_maskHeight,
Modified: trunk/blender/source/blender/editors/mask/mask_add.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_add.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/editors/mask/mask_add.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -385,7 +385,7 @@
setup_vertex_point(mask, spline, new_point, co, tangent, u, NULL, TRUE, 1.0f);
/* TODO - we could pass the spline! */
- BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index + 1, TRUE, TRUE);
+ BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index + 1, true, true);
masklay->act_spline = spline;
masklay->act_point = new_point;
@@ -486,7 +486,7 @@
if (masklay->splines_shapes.first) {
point_index = (((int)(new_point - spline->points) + 0) % spline->tot_point);
- BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, TRUE, TRUE);
+ BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, true, true);
}
if (do_recalc_src) {
@@ -548,7 +548,7 @@
{
int point_index = (((int)(new_point - spline->points) + 0) % spline->tot_point);
- BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, TRUE, TRUE);
+ BKE_mask_layer_shape_changed_add(masklay, BKE_mask_layer_shape_spline_to_index(masklay, spline) + point_index, true, true);
}
WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
Modified: trunk/blender/source/blender/editors/mask/mask_shapekey.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_shapekey.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/editors/mask/mask_shapekey.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -319,7 +319,7 @@
masklay_shape_tmp;
masklay_shape_tmp = masklay_shape_tmp->next)
{
- BKE_mask_layer_evaluate(masklay, masklay_shape_tmp->frame, TRUE);
+ BKE_mask_layer_evaluate(masklay, masklay_shape_tmp->frame, true);
masklay_shape_tmp_rekey = BKE_mask_layer_shape_varify_frame(masklay, masklay_shape_tmp->frame);
BKE_mask_layer_shape_from_mask(masklay, masklay_shape_tmp_rekey);
masklay_shape_tmp_rekey->flag = masklay_shape_tmp->flag & MASK_SHAPE_SELECT;
@@ -376,7 +376,7 @@
}
/* re-evaluate */
- BKE_mask_layer_evaluate(masklay, frame, TRUE);
+ BKE_mask_layer_evaluate(masklay, frame, true);
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mask.c 2013-10-29 18:10:52 UTC (rev 60999)
+++ trunk/blender/source/blender/makesrna/intern/rna_mask.c 2013-10-29 18:46:45 UTC (rev 61000)
@@ -446,7 +446,7 @@
BKE_mask_parent_init(&new_point->parent);
/* Not efficient, but there's no other way for now */
- BKE_mask_layer_shape_changed_add(layer, spline_shape_index + point_index, TRUE, TRUE);
+ BKE_mask_layer_shape_changed_add(layer, spline_shape_index + point_index, true, true);
}
WM_main_add_notifier(NC_MASK | ND_DATA, mask);
More information about the Bf-blender-cvs
mailing list