[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37335] trunk/blender/source/blender: fix for own mistake & fix some comments.

[Campbell Barton]

Revision: 37335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37335
Author:   campbellbarton
Date:     2011-06-09 13:46:34 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
fix for own mistake & fix some comments.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-06-09 12:44:38 UTC (rev 37334)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-06-09 13:46:34 UTC (rev 37335)
@@ -5642,11 +5642,10 @@
 	while(bhead && bhead->code==DATA) {
 		void *data;
 #if 0
-		/* XXX DUMB DEBUGGING OPTION TO GIVE NAMES for guarded malloc errors */		
+		/* XXX DUMB DEBUGGING OPTION TO GIVE NAMES for guarded malloc errors */
 		short *sp= fd->filesdna->structs[bhead->SDNAnr];
-		char *allocname = fd->filesdna->types[ sp[0] ];
 		char *tmp= malloc(100);
-		
+		allocname = fd->filesdna->types[ sp[0] ];
 		strcpy(tmp, allocname);
 		data= read_struct(fd, bhead, tmp);
 #else
@@ -12707,7 +12706,6 @@
 	return 0;
 }
 
-/* when *lib set, it also does objects that were in the appended group */
 static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const short idcode, const short is_link)
 {
 	Object *ob;
@@ -12770,7 +12768,6 @@
 	}
 }
 
-/* when *lib set, it also does objects that were in the appended group */
 static void give_base_to_groups(Main *mainvar, Scene *scene)
 {
 	Group *group;

Modified: trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_internal_types.h	2011-06-09 12:44:38 UTC (rev 37334)
+++ trunk/blender/source/blender/makesrna/intern/rna_internal_types.h	2011-06-09 13:46:34 UTC (rev 37335)
@@ -179,7 +179,8 @@
 	 * since python will convert int/bool/pointer's */
 	struct StructRNA *srna;	/* attributes attached directly to this collection */
 
-	/* python handle to hold all callbacks in a tuple */
+	/* python handle to hold all callbacks
+	 * (in a pointer array at the moment, may later be a tuple) */
 	void *py_data;
 };
 

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2011-06-09 12:44:38 UTC (rev 37334)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c	2011-06-09 13:46:34 UTC (rev 37335)
@@ -144,7 +144,7 @@
 			if( in2[0] != 0.0f )
 				out[0]= floorf(in[0] / in2[0] + 0.5f) * in2[0];
 			else
-				floorf(in[0] + 0.5f);
+				out[0]= floorf(in[0] + 0.5f);
 
 		}
 		break;