Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2013-05-02 14:21:39 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2013-05-02 14:21:39 +0400
commit396222bd01fc0786413d405679b94151eba485b2 (patch)
tree115886ec9d80a555021cd95c2fbe817be262095b
parent0cd35ada0de5dcb93a27ac6fe98a7640e74464ac (diff)
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.
-rw-r--r--source/blender/editors/object/object_modifier.c3
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c1
2 files changed, 0 insertions, 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;
}