diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-05 16:53:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-05 16:53:34 +0400 |
| commit | e9fda259dac3d95018bc9378e2f8f3b10a8c46c4 (patch) | |
| tree | 1e7cd02aebb6900e76dad8f18660e825e43b06aa /source/blender/blenkernel/intern/object.c | |
| parent | 13780799ea143a8220aaacd24d1546dde48ac3b5 (diff) | |
Fix T38476: incorrect hair draw type after editing particle system in edit mode.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 9ed76c505c0..3d08ec22acb 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2984,6 +2984,11 @@ void BKE_object_handle_update_ex(EvaluationContext *eval_ctx, psys = ob->particlesystem.first; while (psys) { + /* ensure this update always happens even if psys is disabled */ + if (psys->recalc & PSYS_RECALC_TYPE) { + psys_changed_type(ob, psys); + } + if (psys_check_enabled(ob, psys)) { /* check use of dupli objects here */ if (psys->part && (psys->part->draw_as == PART_DRAW_REND || eval_ctx->for_render) && |