[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24490] trunk/blender/source/blender: Fix for [#19781] smoke domain displayed in wire even after removed it

Matt Ebb matt at mke3.net
Wed Nov 11 12:49:46 CET 2009


Revision: 24490
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24490
Author:   broken
Date:     2009-11-11 12:49:46 +0100 (Wed, 11 Nov 2009)

Log Message:
-----------
Fix for [#19781] smoke domain displayed in wire even after removed it

Now it resets back to Shaded display, which still may not be what you want, but there's more chance of it, and it's the default.

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	2009-11-11 11:29:56 UTC (rev 24489)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2009-11-11 11:49:46 UTC (rev 24490)
@@ -174,6 +174,9 @@
 
         DAG_scene_sort(scene);
 	}
+	else if(md->type == eModifierType_Smoke) {
+		ob->dt = OB_SHADED;
+	}
 
 	BLI_remlink(&ob->modifiers, md);
 	modifier_free(md);

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2009-11-11 11:29:56 UTC (rev 24489)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2009-11-11 11:49:46 UTC (rev 24490)
@@ -216,8 +216,17 @@
 	smokeModifier_free(smd); // XXX TODO: completely free all 3 pointers
 	smokeModifier_createType(smd); // create regarding of selected type
 
-	if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
-		ob->dt = OB_WIRE;
+	switch (smd->type) {
+		case MOD_SMOKE_TYPE_DOMAIN:
+			ob->dt = OB_WIRE;
+			break;
+		case MOD_SMOKE_TYPE_FLOW:
+		case MOD_SMOKE_TYPE_COLL:
+		case 0:
+		default:
+			ob->dt = OB_SHADED;
+			break;
+	}
 	
 	// update dependancy since a domain - other type switch could have happened
 	rna_Modifier_dependency_update(C, ptr);





More information about the Bf-blender-cvs mailing list