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

bugfix [#19392] Typing help() in the console window freezes Blender

Browse Source 
for now set the sys.stdin to None, this gives an error on input() or help() but better then locking up blender.
Would be nice to support for the blender console to be used as a stdin but this isnt so simple.

also quiet some warnings.
This commit is contained in:
Campbell Barton 2009-09-21 12:23:56 +00:00
parent d2639e732b
commit e9ffd12133
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_file/file_ops.c
View File

@ -72,7 +72,6 @@ static int find_file_mouse(SpaceFile *sfile, struct ARegion* ar, short x, short
{
float fx,fy;
int active_file = -1;
int numfiles = filelist_numfiles(sfile->files);
View2D* v2d = &ar->v2d;
UI_view2d_region_to_view(v2d, x, y, &fx, &fy);

2
source/blender/editors/space_file/space_file.c
View File

@ -155,7 +155,7 @@ static void file_free(SpaceLink *sl)
/* spacetype; init callback, area size changes, screen set, etc */
static void file_init(struct wmWindowManager *wm, ScrArea *sa)
{
SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
//SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
printf("file_init\n");
}

2
source/blender/editors/transform/transform_input.c
View File

@ -34,7 +34,7 @@
#include "transform.h"
#include "MEM_guardedalloc.h"
/* ************************** INPUT FROM MOUSE *************************** */

5
source/blender/python/intern/bpy_interface.c
View File

@ -292,6 +292,11 @@ void BPY_start_python( int argc, char **argv )
PyObject *d = PyEval_GetBuiltins( );
PyDict_SetItemString(d, "reload", item=PyCFunction_New(bpy_reload_meth, NULL)); Py_DECREF(item);
PyDict_SetItemString(d, "__import__", item=PyCFunction_New(bpy_import_meth, NULL)); Py_DECREF(item);
/* a bit nasty but this prevents help() and input() from locking blender
* Ideally we could have some way for the console to replace sys.stdin but
* python would lock blender while waiting for a return value, not easy :| */
PySys_SetObject("stdin", Py_None);
}
pyrna_alloc_types();