Revision: 39673
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39673
Author: campbellbarton
Date: 2011-08-24 14:22:41 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
fix [#28356] Import export STL files, problem in script in version r39307
& correct some bad comments.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39307
Modified Paths:
--------------
trunk/blender/build_files/cmake/config/blender_lite.cmake
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-08-24
13:43:34 UTC (rev 39672)
+++ trunk/blender/build_files/cmake/config/blender_lite.cmake 2011-08-24
14:22:41 UTC (rev 39673)
@@ -1,4 +1,4 @@
-# turn everything OFF CACHE FORCE BOOL) except for python which defaults to ON
+# turn everything OFF except for python which defaults to ON
# and is needed for the UI
#
# Example usage:
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2011-08-24
13:43:34 UTC (rev 39672)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2011-08-24
14:22:41 UTC (rev 39673)
@@ -621,25 +621,31 @@
}
/* some ops have multiple files to select */
+ /* this is called on operators check() so clear collections first since
+ * they may be already set. */
{
PointerRNA itemptr;
+ PropertyRNA *prop_files= RNA_struct_find_property(op->ptr,
"files");
+ PropertyRNA *prop_dirs= RNA_struct_find_property(op->ptr,
"dirs");
int i, numfiles = filelist_numfiles(sfile->files);
- if(RNA_struct_find_property(op->ptr, "files")) {
+ if(prop_files) {
+ RNA_property_collection_clear(op->ptr, prop_files);
for (i=0; i<numfiles; i++) {
if (filelist_is_selected(sfile->files, i,
CHECK_FILES)) {
struct direntry *file=
filelist_file(sfile->files, i);
- RNA_collection_add(op->ptr, "files",
&itemptr);
+ RNA_property_collection_add(op->ptr,
prop_files, &itemptr);
RNA_string_set(&itemptr, "name",
file->relname);
}
}
}
-
- if(RNA_struct_find_property(op->ptr, "dirs")) {
+
+ if(prop_dirs) {
+ RNA_property_collection_clear(op->ptr, prop_dirs);
for (i=0; i<numfiles; i++) {
if (filelist_is_selected(sfile->files, i,
CHECK_DIRS)) {
struct direntry *file=
filelist_file(sfile->files, i);
- RNA_collection_add(op->ptr, "dirs",
&itemptr);
+ RNA_property_collection_add(op->ptr,
prop_dirs, &itemptr);
RNA_string_set(&itemptr, "name",
file->relname);
}
}
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2011-08-24
13:43:34 UTC (rev 39672)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2011-08-24
14:22:41 UTC (rev 39673)
@@ -4320,7 +4320,6 @@
Py_ssize_t pos = 0;
PyObject *value = NULL;
- /* case not, search for it in the script's global dictionary */
while (PyDict_Next(dict, &pos, &key, &value)) {
if(PyUnicode_Check(key)) {
if(strcmp(key_lookup, _PyUnicode_AsString(key))==0) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
