[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56469] trunk/blender/source/blender: Fix [#35173] Object's draw_type resets when removing smoke

[Daniel Genrich]

Revision: 56469
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56469
Author:   genscher
Date:     2013-05-02 10:21:39 +0000 (Thu, 02 May 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_modifier.c
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2013-05-02 09:45:00 UTC (rev 56468)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2013-05-02 10:21:39 UTC (rev 56469)
@@ -304,9 +304,6 @@
 
 		*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))

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-05-02 09:45:00 UTC (rev 56468)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2013-05-02 10:21:39 UTC (rev 56469)
@@ -294,7 +294,6 @@
 		case MOD_SMOKE_TYPE_COLL:
 		case 0:
 		default:
-			ob->dt = OB_TEXTURE;
 			break;
 	}