archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#27324] WindowManager.invoke_search_popup() crashes blender and does not work

Browse Source 
also minor formatting fixes.
This commit is contained in:
Campbell Barton
2011-05-08 12:51:05 +00:00
parent d4e540dff3
commit b432520799
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/modules/bpy/utils.py
View File

@@ -35,6 +35,7 @@ import addon_utils as _addon_utils
_script_module_dirs = "startup", "modules" _script_module_dirs = "startup", "modules"
def _test_import(module_name, loaded_modules): def _test_import(module_name, loaded_modules):
use_time = _bpy.app.debug use_time = _bpy.app.debug

2
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -79,7 +79,7 @@ EnumPropertyItem modifier_type_items[] ={
{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""}, {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""}, {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
{eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""}, {eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""},
{eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
{0, "", 0, "Simulate", ""}, {0, "", 0, "Simulate", ""},
{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""}, {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},

4
source/blender/modifiers/intern/MOD_warp.c
View File

@@ -350,7 +350,7 @@ ModifierTypeInfo modifierType_Warp = {
/* deformVerts */ deformVerts, /* deformVerts */ deformVerts,
/* deformMatrices */ NULL, /* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM, /* deformVertsEM */ deformVertsEM,
/* deformMatricesEM */ NULL, /* deformMatricesEM */ NULL,
/* applyModifier */ 0, /* applyModifier */ 0,
/* applyModifierEM */ 0, /* applyModifierEM */ 0,
/* initData */ initData, /* initData */ initData,
@@ -359,7 +359,7 @@ ModifierTypeInfo modifierType_Warp = {
/* isDisabled */ isDisabled, /* isDisabled */ isDisabled,
/* updateDepgraph */ updateDepgraph, /* updateDepgraph */ updateDepgraph,
/* dependsOnTime */ dependsOnTime, /* dependsOnTime */ dependsOnTime,
/* dependsOnNormals */ NULL, /* dependsOnNormals */ NULL,
/* foreachObjectLink */ foreachObjectLink, /* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ foreachIDLink, /* foreachIDLink */ foreachIDLink,
}; };

15
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -698,11 +698,16 @@ static void operator_enum_call_cb(struct bContext *C, void *arg1, void *arg2)
wmOperatorType *ot= arg1; wmOperatorType *ot= arg1;
if(ot) { if(ot) {
PointerRNA props_ptr; if(ot->prop) {
WM_operator_properties_create_ptr(&props_ptr, ot); PointerRNA props_ptr;
RNA_property_enum_set(&props_ptr, ot->prop, GET_INT_FROM_POINTER(arg2)); WM_operator_properties_create_ptr(&props_ptr, ot);
WM_operator_name_call(C, ot->idname, WM_OP_EXEC_DEFAULT, &props_ptr); RNA_property_enum_set(&props_ptr, ot->prop, GET_INT_FROM_POINTER(arg2));
WM_operator_properties_free(&props_ptr); WM_operator_name_call(C, ot->idname, WM_OP_EXEC_DEFAULT, &props_ptr);
WM_operator_properties_free(&props_ptr);
}
else {
printf("operator_enum_call_cb: op->prop for '%s' is NULL\n", ot->idname);
}
} }
} }