Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-03-09 10:35:12 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-03-09 10:35:12 +0300
commitd9da14d8a72aa99ea09d979de154798d30e653cb (patch)
tree389478476e3437c91c18efbd035f4d8cbaf1d9c6 /source/blender/python/api2_2x/Window.c
parenta339bca9a137eb3fc7cea546094dbc88e7bce06d (diff)
fix for uninitialized variables in uv stretch drawing,
[#8428] 'Editmesh_active' theme colour not accessible via Python bugfix problem where saving a theme would raise and error when ~/.blender didnt exist. bugfix for file selector staying open (introduced with own undo resistant scripts)
Diffstat (limited to 'source/blender/python/api2_2x/Window.c')
-rw-r--r--source/blender/python/api2_2x/Window.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/python/api2_2x/Window.c b/source/blender/python/api2_2x/Window.c
index 46f696b2c74..5cfe796add8 100644
--- a/source/blender/python/api2_2x/Window.c
+++ b/source/blender/python/api2_2x/Window.c
@@ -527,8 +527,9 @@ static void getSelectedFile( char *name )
}
else Py_DECREF(result);
- if (script->py_browsercallback == pycallback)
- script->py_browsercallback = NULL;
+ if (script->py_browsercallback == pycallback) {
+ SCRIPT_SET_NULL(script);
+ }
/* else another call to selector was made inside pycallback */
Py_DECREF(pycallback);
@@ -599,8 +600,12 @@ static PyObject *M_Window_FileSelector( PyObject * self, PyObject * args )
}
script->py_browsercallback = pycallback;
+ /* if were not running a script GUI here alredy, then dont make this script persistant */
+ if ((script->flags & SCRIPT_GUI)==0) {
+ script->scriptname[0] = '\0';
+ script->scriptarg[0] = '\0';
+ }
activate_fileselect( FILE_BLENDER, title, filename, getSelectedFile );
-
Py_RETURN_NONE;
}