[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15055] trunk/blender/source/blender: bugfix

[Campbell Barton]

Revision: 15055
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15055
Author:   campbellbarton
Date:     2008-05-30 03:59:15 +0200 (Fri, 30 May 2008)

Log Message:
-----------
bugfix
* scene.object.context and scene.object.selected had broken get_item 
funcs so scene.object.context[i]  returned the wrong object.
* aligning the view to an object (numpad*key), did not disable the 
ortho view grid.
* long standing problem where opening a relative image would fail with 
no message. BLI_convertstringcode was returning a path with /../../'s 
that need to be cleaned before the path could be read, the path was also 
invalid from unix shell so its not a blender path reading problem.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/util.c
    trunk/blender/source/blender/python/api2_2x/Scene.c
    trunk/blender/source/blender/src/view.c

Modified: trunk/blender/source/blender/blenlib/intern/util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/util.c	2008-05-30 01:02:40 UTC (rev 15054)
+++ trunk/blender/source/blender/blenlib/intern/util.c	2008-05-30 01:59:15 UTC (rev 15055)
@@ -1166,6 +1166,7 @@
 		MEM_freeN(filepart);
 	}
 	
+	BLI_cleanup_file(NULL, tmp);
 	strcpy(path, tmp);
 	
 #ifdef WIN32

Modified: trunk/blender/source/blender/python/api2_2x/Scene.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Scene.c	2008-05-30 01:02:40 UTC (rev 15054)
+++ trunk/blender/source/blender/python/api2_2x/Scene.c	2008-05-30 01:59:15 UTC (rev 15055)
@@ -1355,16 +1355,29 @@
 		for (base= scene->base.first; base && i!=index; base= base->next, index++) {}
 	/* selected */
 	else if (self->mode==EXPP_OBSEQ_SELECTED) {
-		for (base= scene->base.first; base && i!=index; base= base->next)
-			if (base->flag & SELECT)
-				index++;
+		for (base= scene->base.first; base; base= base->next) {
+			if (base->flag & SELECT) {
+				if (i==index) {
+					break;
+				} else {
+					index++;
+				}
+			}
+		}
 	}
 	/* context */
 	else if (self->mode==EXPP_OBSEQ_CONTEXT) {
-		if (G.vd)
-			for (base= scene->base.first; base && i!=index; base= base->next)
-				if TESTBASE(base)
-					index++;
+		if (G.vd) {
+			for (base= scene->base.first; base; base= base->next) {
+				if (TESTBASE(base)) {
+					if (i==index) {
+						break;
+					} else {
+						index++;
+					}
+				}
+			}
+		}
 	}
 	
 	if (!(base))

Modified: trunk/blender/source/blender/src/view.c
===================================================================
--- trunk/blender/source/blender/src/view.c	2008-05-30 01:02:40 UTC (rev 15054)
+++ trunk/blender/source/blender/src/view.c	2008-05-30 01:59:15 UTC (rev 15055)
@@ -1448,6 +1448,8 @@
 	float bmat[4][4];
 	float tmat[3][3];
 
+	G.vd->view= 0; /* dont show the grid */
+
 	Mat4CpyMat4(bmat, ob->obmat);
 	Mat4Ortho(bmat);
 	Mat4Invert(G.vd->viewmat, bmat);