[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26432] trunk/blender/source/blender: bugfix [#20417] shouldn't be stored in recent item list

[Campbell Barton]

Revision: 26432
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26432
Author:   campbellbarton
Date:     2010-01-30 15:34:37 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
bugfix [#20417] <memory> shouldn't be stored in recent item list

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/python/generic/matrix.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c    2010-01-30 
14:12:51 UTC (rev 26431)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c    2010-01-30 
14:34:37 UTC (rev 26432)
@@ -304,8 +304,9 @@
        if(G.main->versionfile < 250)
                do_versions_ipos_to_animato(G.main); // XXX fixme... 
complicated versionpatching
        
-       /* in case of autosave or quit.blend, use original filename instead */
-       if(recover && bfd->filename[0])
+       /* in case of autosave or quit.blend, use original filename instead
+        * use relbase_valid to make sure the file is saved, else we get 
<memory2> in the filename */
+       if(recover && bfd->filename[0] && G.relbase_valid)
                filename= bfd->filename;
        
        /* these are the same at times, should never copy to the same location 
*/

Modified: trunk/blender/source/blender/python/generic/matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/matrix.c        2010-01-30 
14:12:51 UTC (rev 26431)
+++ trunk/blender/source/blender/python/generic/matrix.c        2010-01-30 
14:34:37 UTC (rev 26432)
@@ -1233,8 +1233,6 @@
 
 static PyObject *Matrix_getIsNegative( MatrixObject * self, void *type )
 {
-       float vec[3];
-
        if(!BaseMath_ReadCallback(self))
                return NULL;
 
@@ -1257,7 +1255,7 @@
        {"row_size", (getter)Matrix_getRowSize, (setter)NULL, "The row size of 
the matrix (readonly). **type** int", NULL},
        {"col_size", (getter)Matrix_getColSize, (setter)NULL, "The column size 
of the matrix (readonly). **type** int", NULL},
        {"median_scale", (getter)Matrix_getMedianScale, (setter)NULL, "The 
average scale applied to each axis (readonly). **type** float", NULL},
-       {"is_negative", (getter)Matrix_getIsNegative, (setter)NULL, "True if 
this matrix results in a negative scale, (3x3, 4x4 only) (readonly). **type** 
bool", NULL},
+       {"is_negative", (getter)Matrix_getIsNegative, (setter)NULL, "True if 
this matrix results in a negative scale, 3x3 and 4x4 only, (readonly). **type** 
bool", NULL},
        {"is_wrapped", (getter)BaseMathObject_getWrapped, (setter)NULL, 
BaseMathObject_Wrapped_doc, NULL},
        {"_owner",(getter)BaseMathObject_getOwner, (setter)NULL, 
BaseMathObject_Owner_doc, NULL},
        {NULL,NULL,NULL,NULL,NULL}  /* Sentinel */


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs