[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28181] trunk/blender/source/blender: fix for crash when a register script sets material colors, also made some changes to modifier formatting.

[Campbell Barton]

Revision: 28181
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28181
Author:   campbellbarton
Date:     2010-04-14 00:43:48 +0200 (Wed, 14 Apr 2010)

Log Message:
-----------
fix for crash when a register script sets material colors, also made some changes to modifier formatting.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_build.c
    trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
    trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
    trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
    trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_build.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_build.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/modifiers/intern/MOD_build.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -271,17 +271,8 @@
 
 		   return result;
 }
-/*
-		mti = INIT_TYPE(Build);
-		mti->type = eModifierTypeType_Nonconstructive;
-		mti->flags = eModifierTypeFlag_AcceptsMesh |
-				eModifierTypeFlag_AcceptsCVs;
-		mti->initData = buildModifier_initData;
-		mti->copyData = buildModifier_copyData;
-		mti->dependsOnTime = buildModifier_dependsOnTime;
-		mti->applyModifier = buildModifier_applyModifier;
-*/
 
+
 ModifierTypeInfo modifierType_Build = {
 	/* name */              "Build",
 	/* structName */        "BuildModifierData",

Modified: trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cloth.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cloth.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -175,9 +175,9 @@
 	/* structName */        "ClothModifierData",
 	/* structSize */        sizeof(ClothModifierData),
 	/* type */              eModifierTypeType_Nonconstructive,
-	/* flags */             eModifierTypeFlag_AcceptsMesh |
-							eModifierTypeFlag_UsesPointCache |
-							eModifierTypeFlag_Single,
+	/* flags */             eModifierTypeFlag_AcceptsMesh
+							| eModifierTypeFlag_UsesPointCache
+							| eModifierTypeFlag_Single,
 
 	/* copyData */          copyData,
 	/* deformVerts */       0,

Modified: trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -317,10 +317,10 @@
 	/* structName */        "ParticleInstanceModifierData",
 	/* structSize */        sizeof(ParticleInstanceModifierData),
 	/* type */              eModifierTypeType_Constructive,
-	/* flags */             eModifierTypeFlag_AcceptsMesh |
-							eModifierTypeFlag_SupportsMapping |
-							eModifierTypeFlag_SupportsEditmode |
-							eModifierTypeFlag_EnableInEditmode,
+	/* flags */             eModifierTypeFlag_AcceptsMesh
+							| eModifierTypeFlag_SupportsMapping
+							| eModifierTypeFlag_SupportsEditmode
+							| eModifierTypeFlag_EnableInEditmode,
 
 	/* copyData */          copyData,
 	/* deformVerts */       0,

Modified: trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -209,11 +209,11 @@
 	/* structName */        "ParticleSystemModifierData",
 	/* structSize */        sizeof(ParticleSystemModifierData),
 	/* type */              eModifierTypeType_OnlyDeform,
-	/* flags */             eModifierTypeFlag_AcceptsMesh |
-							eModifierTypeFlag_SupportsMapping |
-							eModifierTypeFlag_UsesPointCache /* |
-							eModifierTypeFlag_SupportsEditmode |
-							eModifierTypeFlag_EnableInEditmode */,
+	/* flags */             eModifierTypeFlag_AcceptsMesh
+							| eModifierTypeFlag_SupportsMapping
+							| eModifierTypeFlag_UsesPointCache /*
+							| eModifierTypeFlag_SupportsEditmode
+							| eModifierTypeFlag_EnableInEditmode */,
 
 	/* copyData */          copyData,
 	/* deformVerts */       deformVerts,

Modified: trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smooth.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smooth.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -249,8 +249,8 @@
 	/* structName */        "SmoothModifierData",
 	/* structSize */        sizeof(SmoothModifierData),
 	/* type */              eModifierTypeType_OnlyDeform,
-	/* flags */             eModifierTypeFlag_AcceptsMesh | 
-							eModifierTypeFlag_SupportsEditmode,
+	/* flags */             eModifierTypeFlag_AcceptsMesh
+							| eModifierTypeFlag_SupportsEditmode,
 
 	/* copyData */          copyData,
 	/* deformVerts */       deformVerts,

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-04-13 22:20:02 UTC (rev 28180)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-04-13 22:43:48 UTC (rev 28181)
@@ -299,11 +299,11 @@
 		CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first);
 		ED_editors_init(C);
 
-		CTX_wm_window_set(C, NULL); /* exits queues */
 #ifndef DISABLE_PYTHON
 		/* run any texts that were loaded in and flagged as modules */
 		BPY_load_user_modules(C);
 #endif
+		CTX_wm_window_set(C, NULL); /* exits queues */
 	}
 	else if(retval==1)
 		BKE_write_undo(C, "Import file");