From 85590301a53f97080208d40ee97d88c4789d72d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 13 Apr 2010 22:43:48 +0000 Subject: [PATCH] fix for crash when a register script sets material colors, also made some changes to modifier formatting. --- source/blender/modifiers/intern/MOD_build.c | 11 +---------- source/blender/modifiers/intern/MOD_cloth.c | 6 +++--- .../blender/modifiers/intern/MOD_particleinstance.c | 8 ++++---- source/blender/modifiers/intern/MOD_particlesystem.c | 10 +++++----- source/blender/modifiers/intern/MOD_smooth.c | 4 ++-- source/blender/windowmanager/intern/wm_files.c | 2 +- 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 38ba587c631..c946665e215 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -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", diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index d2f36a86c25..865157ce585 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -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, diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 545003b1576..0f4bf00d1ad 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -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, diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index d806ab71f24..02480b8d2a3 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -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, diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index ca72c37a72c..052d4641e2f 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -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, diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index ff5797b1e69..3c7548fb39f 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -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");