diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
commit | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (patch) | |
tree | f5742a0f4414a99bd6738aae9cf4dc21b307fbfc /source/blender/editors/physics | |
parent | da00a50f7f48bfd95924705e69babea41f9d7b2b (diff) | |
parent | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/dynamicpaint_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index e068b898345..6360e6281c8 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -367,7 +367,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job) scene->r.cfra = (int)frame; ED_update_for_newframe(job->bmain, scene, job->view_layer, job->depsgraph); - /* Init surface */ + /* Init surface */ if (!dynamicPaint_createUVSurface(scene, surface, job->progress, job->do_update)) { job->success = 0; return; @@ -508,7 +508,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) WM_set_locked_interface(CTX_wm_manager(C), true); - /* Bake Dynamic Paint */ + /* Bake Dynamic Paint */ WM_jobs_start(CTX_wm_manager(C), wm_job); return OPERATOR_FINISHED; |