diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2004-07-20 12:16:46 +0400 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2004-07-20 12:16:46 +0400 |
commit | 7b3b3ae432f692ed32f57aa70bdab5b89a05be21 (patch) | |
tree | 5cb77a8ba082858798b6312a8b6d20824abaaf53 /source/blender/python/api2_2x/gen_utils.c | |
parent | 9bf16550706c7fdf22d6d76b0e5a41ec3b538fbc (diff) |
Trying to fix bug reported by Peter den Bak and Meino Christian Cramer (thanks!):
-- splash screen disappeared (duh, I did that!) and Blender quits upon exiting from some 225 games:
It was troublesome to find how to run demos in general with the screen correctly redrawn before they started, etc. Ended up making the above error in screenmain(). About the games, I don't have them and will need some time to get the files for testing, but I'll do it, though only on linux.
BPython:
-- Window: added GetScreens, SetScreen and improved GetScreenInfo.
-- Object, NMesh: updated (added in NMesh) method getMaterials to return either only valid materials as before or also empty slots (as None). This previous omission can be considered a bug, since it made info about materials incomplete / incompatible with face mat indices. Thanks Yann Vernier for bringing this up and sending/proposing a patch that also fixed a bug related to assigning lists of materials with different lengths to obj and its mesh. setMaterials also accepts Py_None entries now, which become empty slots in Blender.
-- doc updates.
Diffstat (limited to 'source/blender/python/api2_2x/gen_utils.c')
-rw-r--r-- | source/blender/python/api2_2x/gen_utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/python/api2_2x/gen_utils.c b/source/blender/python/api2_2x/gen_utils.c index 20a6e92d9d2..3f8ff62cee2 100644 --- a/source/blender/python/api2_2x/gen_utils.c +++ b/source/blender/python/api2_2x/gen_utils.c @@ -145,17 +145,18 @@ int EXPP_check_sequence_consistency(PyObject *seq, PyTypeObject *against) { PyObject *ob; int len = PySequence_Length(seq); - int i; + int i, result = 1; for (i = 0; i < len; i++) { ob = PySequence_GetItem(seq, i); - if (ob->ob_type != against) { + if (ob == Py_None) result = 2; + else if (ob->ob_type != against) { Py_DECREF(ob); return 0; } Py_DECREF(ob); } - return 1; + return result; /* 1 if all of 'against' type, 2 if there are (also) Nones */ } PyObject *EXPP_tuple_repr(PyObject *self, int size) |