diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-04-23 09:56:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-04-23 09:56:09 +0400 |
| commit | d00c3ef2d6339aa01ddbc56bacd20f1ef4473a27 (patch) | |
| tree | 204d1d094d4618298d0db89ca75242f32095cadc /source/blender | |
| parent | 7ee587c04a040893c86399b6df7b74b22a737206 (diff) | |
Small changes
- font->blur was uninitialized
- Use Ctrl+Alt+Shift+P to run scripts from the 3d view not Pkey. (still useful for testing)
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_script/script_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 9a4c0fdfa30..6d185378c25 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -368,6 +368,7 @@ FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size) font->name= BLI_strdup(name); font->filename= NULL; font->engine= (void *)face; + font->blur= 0; blf_font_fill(font); return(font); } diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index d2aa9959a9d..25aea4a8d65 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -67,6 +67,6 @@ void script_keymap(wmWindowManager *wm) 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"); } diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 41ef16bea4a..8292670de8f 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -224,7 +224,7 @@ void view3d_keymap(wmWindowManager *wm) 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); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 0b05b11deff..3df0a349a6a 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1989,7 +1989,7 @@ PyObject *pyrna_basetype_unregister(PyObject *self, PyObject *args) 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)) { |