Revision: 14155
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14155
Author: campbellbarton
Date: 2008-03-17 19:01:59 +0100 (Mon, 17 Mar 2008)
Log Message:
-----------
- [#8589] Scripts which use file selector not working correctly
Fix for another bug I introduced with persistent python windows.
also removed unused var.
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/Window.c
trunk/blender/source/blender/src/seqeffects.c
Modified: trunk/blender/source/blender/python/api2_2x/Window.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Window.c 2008-03-17
16:45:20 UTC (rev 14154)
+++ trunk/blender/source/blender/python/api2_2x/Window.c 2008-03-17
18:01:59 UTC (rev 14155)
@@ -535,10 +535,17 @@
fprintf(stderr, "BPy error: Callback call
failed!\n");
}
else Py_DECREF(result);
-
+
+
+
if (script->py_browsercallback == pycallback) {
- SCRIPT_SET_NULL(script);
+ if (script->flags & SCRIPT_GUI) {
+ script->py_browsercallback = NULL;
+ } else {
+ SCRIPT_SET_NULL(script);
+ }
}
+
/* else another call to selector was made inside pycallback */
Py_DECREF(pycallback);
Modified: trunk/blender/source/blender/src/seqeffects.c
===================================================================
--- trunk/blender/source/blender/src/seqeffects.c 2008-03-17 16:45:20 UTC
(rev 14154)
+++ trunk/blender/source/blender/src/seqeffects.c 2008-03-17 18:01:59 UTC
(rev 14155)
@@ -986,7 +986,7 @@
float *rect1, float *rect2,
float *out)
{
- float fac1, fac2, col;
+ float fac1, fac2;
int xo;
float *rt1, *rt2, *rt;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
