fix for crash when a register script sets material colors, also made some changes...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Apr 2010 22:43:48 +0000 (22:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Apr 2010 22:43:48 +0000 (22:43 +0000)
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/windowmanager/intern/wm_files.c

index 38ba587c631c56715be65095d6b41c78521b5a19..c946665e2153b6bf127e37eca57c2ccfef3c1cd3 100644 (file)
@@ -271,16 +271,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
                   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",
index d2f36a86c25d60c35a16b7a6910064fccdfc32cd..865157ce585db565c1aad158b1ead5fedc0164ed 100644 (file)
@@ -175,9 +175,9 @@ ModifierTypeInfo modifierType_Cloth = {
        /* 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,
index 545003b15761bff1c5d551a6dc6bda08f735795d..0f4bf00d1adda025725bb6e4a6850db878a78521 100644 (file)
@@ -317,10 +317,10 @@ ModifierTypeInfo modifierType_ParticleInstance = {
        /* 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,
index d806ab71f24bb5330c9e695e34eb03aaf4c541a2..02480b8d2a30110aacd29ab418444982e2089057 100644 (file)
@@ -209,11 +209,11 @@ ModifierTypeInfo modifierType_ParticleSystem = {
        /* 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,
index ca72c37a72c2902c83471159b591bf904aee6a32..052d4641e2f65c257f0e56bcc3cde4e2ac03f87d 100644 (file)
@@ -249,8 +249,8 @@ ModifierTypeInfo modifierType_Smooth = {
        /* structName */        "SmoothModifierData",
        /* structSize */        sizeof(SmoothModifierData),
        /* type */              eModifierTypeType_OnlyDeform,
-       /* flags */             eModifierTypeFlag_AcceptsMesh | 
-                                                       eModifierTypeFlag_SupportsEditmode,
+       /* flags */             eModifierTypeFlag_AcceptsMesh
+                                                       eModifierTypeFlag_SupportsEditmode,
 
        /* copyData */          copyData,
        /* deformVerts */       deformVerts,
index ff5797b1e695b5b840000567299f1d285a495062..3c7548fb39f2afaf0007c2f0389b9c4144340e7b 100644 (file)
@@ -299,11 +299,11 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
                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");