[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12823] trunk/blender/source/blender/src/ interface.c: interface.c - silencing warnings:

Joshua Leung aligorith at gmail.com
Sat Dec 8 06:20:40 CET 2007


Revision: 12823
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12823
Author:   aligorith
Date:     2007-12-08 06:20:40 +0100 (Sat, 08 Dec 2007)

Log Message:
-----------
interface.c - silencing warnings:
- 577: control reaches end of non-void function (in ui_but_copy_paste)

- 138: initialization makes integer from pointer without a cast
(I'm not sure whether the fix might cause errors on some systems/builds, but it works fine here)

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

Modified: trunk/blender/source/blender/src/interface.c
===================================================================
--- trunk/blender/source/blender/src/interface.c	2007-12-07 21:45:34 UTC (rev 12822)
+++ trunk/blender/source/blender/src/interface.c	2007-12-08 05:20:40 UTC (rev 12823)
@@ -135,7 +135,7 @@
 static char but_copypaste_str[256]="";
 static double but_copypaste_val=0.0;
 static float but_copypaste_rgb[3];
-static ColorBand but_copypaste_coba = { NULL };
+static ColorBand but_copypaste_coba;
 
 /* ************* PROTOTYPES ***************** */
 
@@ -526,7 +526,6 @@
 		}
 	}
 	else if(but->type==TEX) {
-		
 		if(poin==NULL);
 		else if(mode=='c') {
 			strncpy(but_copypaste_str, but->poin, but->max);
@@ -546,7 +545,6 @@
 		}
 	}
 	else if(but->type==IDPOIN) {
-		
 		if(mode=='c') {
 			ID *id= *but->idpoin_idpp;
 			if(id) strncpy(but_copypaste_str, id->name+2, 22);
@@ -574,6 +572,8 @@
 			return 1;
 		}
 	}
+	
+	return 0;
 }
 
 /* ******************* block calc ************************* */





More information about the Bf-blender-cvs mailing list