sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Campbell Barton 2010-04-13 22:43:48 +00:00
parent 6c01295a0a
commit 85590301a5
6 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_build.c
View 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",

6
source/blender/modifiers/intern/MOD_cloth.c
View 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,

8
source/blender/modifiers/intern/MOD_particleinstance.c
View 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,

10
source/blender/modifiers/intern/MOD_particlesystem.c
View 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,

4
source/blender/modifiers/intern/MOD_smooth.c
View 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,

2
source/blender/windowmanager/intern/wm_files.c
View 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");