[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38847] trunk/blender/source/blender: quiet some compiler warnings & fix possible (but unlikely) crash.

[Campbell Barton]

Revision: 38847
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38847
Author:   campbellbarton
Date:     2011-07-30 09:24:10 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
quiet some compiler warnings & fix possible (but unlikely) crash.
also added GPLv2+ header to resources.c.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/BLI_args.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/interface/interface_anim.c
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c	2011-07-30 05:23:10 UTC (rev 38846)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c	2011-07-30 09:24:10 UTC (rev 38847)
@@ -290,8 +290,10 @@
 					}
 					i += retval;
 				} else if (retval == -1){
-					if (a->key->pass != -1)
-						ba->passes[i] = pass;
+					if (a) {
+						if (a->key->pass != -1)
+							ba->passes[i] = pass;
+					}
 					break;
 				}
 			}

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2011-07-30 05:23:10 UTC (rev 38846)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2011-07-30 09:24:10 UTC (rev 38847)
@@ -6544,12 +6544,15 @@
 		BLI_assert(!"invalid nurbs type");
 		return NULL;
 	}
-	
-	/* always do: */
-	nu->flag |= CU_SMOOTH;
-	
-	test2DNurb(nu);
-	
+
+	BLI_assert(nu != NULL);
+
+	if(nu) { /* should always be set */
+		nu->flag |= CU_SMOOTH;
+
+		test2DNurb(nu);
+	}
+
 	return nu;
 }
 

Modified: trunk/blender/source/blender/editors/interface/interface_anim.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_anim.c	2011-07-30 05:23:10 UTC (rev 38846)
+++ trunk/blender/source/blender/editors/interface/interface_anim.c	2011-07-30 09:24:10 UTC (rev 38847)
@@ -1,3 +1,27 @@
+/*
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s):
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
 /** \file blender/editors/interface/interface_anim.c
  *  \ingroup edinterface
  */

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2011-07-30 05:23:10 UTC (rev 38846)
+++ trunk/blender/source/blender/editors/interface/resources.c	2011-07-30 09:24:10 UTC (rev 38847)
@@ -1,6 +1,3 @@
-/** \file blender/editors/interface/resources.c
- *  \ingroup edinterface
- */
 /*
  * $Id$
  *
@@ -33,6 +30,10 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
+/** \file blender/editors/interface/resources.c
+ *  \ingroup edinterface
+ */
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2011-07-30 05:23:10 UTC (rev 38846)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2011-07-30 09:24:10 UTC (rev 38847)
@@ -1096,7 +1096,7 @@
 	Scene *scene= CTX_data_scene(C);
 	View3D *v3d= CTX_wm_view3d(C);
 	unsigned int lay, local;
-	int islamp= 0;
+	/* int islamp= 0; */ /* UNUSED */
 	
 	lay= move_to_layer_init(C, op);
 	lay &= 0xFFFFFF;
@@ -1112,7 +1112,7 @@
 			base->object->lay= lay;
 			base->object->flag &= ~SELECT;
 			base->flag &= ~SELECT;
-			if(base->object->type==OB_LAMP) islamp= 1;
+			/* if(base->object->type==OB_LAMP) islamp= 1; */
 		}
 		CTX_DATA_END;
 	}
@@ -1124,7 +1124,7 @@
 			local= base->lay & 0xFF000000;  
 			base->lay= lay + local;
 			base->object->lay= lay;
-			if(base->object->type==OB_LAMP) islamp= 1;
+			/* if(base->object->type==OB_LAMP) islamp= 1; */
 		}
 		CTX_DATA_END;
 	}