[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17220] trunk/blender/source/blender/src/ buttons_editing.c: This is a fix for coverity issue CID: 517

[Kent Mein]

Revision: 17220
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17220
Author:   sirdude
Date:     2008-10-29 18:45:02 +0100 (Wed, 29 Oct 2008)

Log Message:
-----------
This is a fix for coverity issue CID: 517
Basically the code was referencing var[-1] it wasn't using it
but also did not need to be set in those cases.  So I moved
the assignments so it skips the -1 case.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-10-29 16:49:51 UTC (rev 17219)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-10-29 17:45:02 UTC (rev 17220)
@@ -5833,11 +5833,11 @@
 	for(i=-1; i<8; i++) {
 		char str[64];
 		int loos;
-		mtex= sd->mtex[i];
 
 		if(i==-1)
 			strcpy(str, "Default");
 		else {
+			mtex= sd->mtex[i];
 			if(mtex && mtex->tex) splitIDname(mtex->tex->id.name+2, str, &loos);
 			else strcpy(str, "");
 		}
@@ -5848,12 +5848,12 @@
 
 	cy= orig_y-20;
 	cx+= 85;
-	mtex= sd->mtex[sd->texact];
 
 	if(sd->texact == -1) {
 		uiBlockBeginAlign(block);
 		uiDefBut(block,LABEL,B_NOP,"",cx,cy,115,20,0,0,0,0,0,""); /* Padding */
 	} else {
+		mtex= sd->mtex[sd->texact];
 		ID *id= NULL;
 		uiBlockBeginAlign(block);