[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36548] trunk/blender: fix [#27324] WindowManager.invoke_search_popup() crashes blender and does not work

[Campbell Barton]

Revision: 36548
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36548
Author:   campbellbarton
Date:     2011-05-08 12:51:05 +0000 (Sun, 08 May 2011)
Log Message:
-----------
fix [#27324] WindowManager.invoke_search_popup() crashes blender and does not work
also minor formatting fixes.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/modifiers/intern/MOD_warp.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2011-05-08 10:29:40 UTC (rev 36547)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2011-05-08 12:51:05 UTC (rev 36548)
@@ -35,6 +35,7 @@
 
 _script_module_dirs = "startup", "modules"
 
+
 def _test_import(module_name, loaded_modules):
     use_time = _bpy.app.debug
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2011-05-08 10:29:40 UTC (rev 36547)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2011-05-08 12:51:05 UTC (rev 36548)
@@ -79,7 +79,7 @@
 	{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
 	{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
 	{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", ""},
 	{0, "", 0, "Simulate", ""},
 	{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},

Modified: trunk/blender/source/blender/modifiers/intern/MOD_warp.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_warp.c	2011-05-08 10:29:40 UTC (rev 36547)
+++ trunk/blender/source/blender/modifiers/intern/MOD_warp.c	2011-05-08 12:51:05 UTC (rev 36548)
@@ -350,7 +350,7 @@
 	/* deformVerts */       deformVerts,
 	/* deformMatrices */    NULL,
 	/* deformVertsEM */     deformVertsEM,
-    /* deformMatricesEM */  NULL,
+	/* deformMatricesEM */  NULL,
 	/* applyModifier */     0,
 	/* applyModifierEM */   0,
 	/* initData */          initData,
@@ -359,7 +359,7 @@
 	/* isDisabled */        isDisabled,
 	/* updateDepgraph */    updateDepgraph,
 	/* dependsOnTime */     dependsOnTime,
-    /* dependsOnNormals */	NULL,
+	/* dependsOnNormals */	NULL,
 	/* foreachObjectLink */ foreachObjectLink,
 	/* foreachIDLink */     foreachIDLink,
 };

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-05-08 10:29:40 UTC (rev 36547)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-05-08 12:51:05 UTC (rev 36548)
@@ -698,11 +698,16 @@
 	wmOperatorType *ot= arg1;
 
 	if(ot) {
-		PointerRNA props_ptr;
-		WM_operator_properties_create_ptr(&props_ptr, ot);
-		RNA_property_enum_set(&props_ptr, ot->prop, GET_INT_FROM_POINTER(arg2));
-		WM_operator_name_call(C, ot->idname, WM_OP_EXEC_DEFAULT, &props_ptr);
-		WM_operator_properties_free(&props_ptr);
+		if(ot->prop) {
+			PointerRNA props_ptr;
+			WM_operator_properties_create_ptr(&props_ptr, ot);
+			RNA_property_enum_set(&props_ptr, ot->prop, GET_INT_FROM_POINTER(arg2));
+			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);
+		}
 	}
 }