From 396222bd01fc0786413d405679b94151eba485b2 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Thu, 2 May 2013 10:21:39 +0000 Subject: [PATCH] Fix [#35173] Object's draw_type resets when removing smoke New behaviour: * On creation, smoke modifier only changes the drawtype for domain to WIRE. * On deletion, smoke modifier does not change the drawtype. --- source/blender/editors/object/object_modifier.c | 3 --- source/blender/makesrna/intern/rna_modifier.c | 1 - 2 files changed, 4 deletions(-) diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 7d9feec6d78..b743f891f66 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -304,9 +304,6 @@ static int object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, *sort_depsgraph = 1; } - else if (md->type == eModifierType_Smoke) { - ob->dt = OB_TEXTURE; - } else if (md->type == eModifierType_Multires) { /* Delete MDisps layer if not used by another multires modifier */ if (object_modifier_safe_to_delete(bmain, ob, md, eModifierType_Multires)) diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 29eb967e3ce..3cf1e0c3b20 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -294,7 +294,6 @@ static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) case MOD_SMOKE_TYPE_COLL: case 0: default: - ob->dt = OB_TEXTURE; break; }