[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19892] branches/blender2.5/blender/source /blender: Small changes

[Campbell Barton]

Revision: 19892
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19892
Author:   campbellbarton
Date:     2009-04-23 07:56:09 +0200 (Thu, 23 Apr 2009)

Log Message:
-----------
Small changes
- font->blur was uninitialized
- Use Ctrl+Alt+Shift+P to run scripts from the 3d view not Pkey. (still useful for testing)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
    branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c

Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c	2009-04-23 02:27:11 UTC (rev 19891)
+++ branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c	2009-04-23 05:56:09 UTC (rev 19892)
@@ -368,6 +368,7 @@
 	font->name= BLI_strdup(name);
 	font->filename= NULL;
 	font->engine= (void *)face;
+	font->blur= 0;
 	blf_font_fill(font);
 	return(font);
 }

Modified: branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c	2009-04-23 02:27:11 UTC (rev 19891)
+++ branches/blender2.5/blender/source/blender/editors/space_script/script_ops.c	2009-04-23 05:56:09 UTC (rev 19892)
@@ -67,6 +67,6 @@
 	ListBase *keymap= WM_keymap_listbase(wm, "Script", SPACE_SCRIPT, 0);
 
 	/* TODO - this is just while we have no way to load a text datablock */
-	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0)->ptr, "filename", "test.py");
 }
 

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c	2009-04-23 02:27:11 UTC (rev 19891)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c	2009-04-23 05:56:09 UTC (rev 19892)
@@ -224,7 +224,7 @@
 	RNA_enum_set(WM_keymap_add_item(keymap, "PAINT_OT_texture_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH);
 
 	/* TODO - this is just while we have no way to load a text datablock */
-	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+	RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0)->ptr, "filename", "test.py");
 
 	transform_keymap_for_space(wm, keymap, SPACE_VIEW3D);
 

Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2009-04-23 02:27:11 UTC (rev 19891)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c	2009-04-23 05:56:09 UTC (rev 19892)
@@ -1989,7 +1989,7 @@
 	BPy_StructRNA *py_srna;
 	StructUnregisterFunc unreg;
 
-	if(!PyArg_ParseTuple(args, "O:register", &py_class))
+	if(!PyArg_ParseTuple(args, "O:unregister", &py_class))
 		return NULL;
 
 	if(!PyType_Check(py_class)) {