diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-11-11 04:14:48 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-11-11 04:41:13 +0300 |
| commit | 9465b109af0b70244a36f9e68493e316d9f8b56f (patch) | |
| tree | c4d933bf09f8313071556063156538ec3356b24c /source/blender/editors/physics/dynamicpaint_ops.c | |
| parent | 026d21a225521670c6b5083da9da61227da69e65 (diff) | |
| parent | ca1642cd0c5cdf634fe2022c955d93983de95934 (diff) | |
Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic
Diffstat (limited to 'source/blender/editors/physics/dynamicpaint_ops.c')
| -rw-r--r-- | source/blender/editors/physics/dynamicpaint_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 41238eb171b..1a3f0f0f2ac 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -285,7 +285,7 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot) typedef struct DynamicPaintBakeJob { /* from wmJob */ void *owner; - short *stop, *do_update; + bool *stop, *do_update; float *progress; struct Main *bmain; @@ -429,7 +429,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) ED_update_for_newframe(job->bmain, job->depsgraph); } -static void dpaint_bake_startjob(void *customdata, short *stop, short *do_update, float *progress) +static void dpaint_bake_startjob(void *customdata, bool *stop, bool *do_update, float *progress) { DynamicPaintBakeJob *job = customdata; @@ -450,7 +450,7 @@ static void dpaint_bake_startjob(void *customdata, short *stop, short *do_update dynamicPaint_bakeImageSequence(job); *do_update = true; - *stop = 0; + *stop = false; } /* |