From d4ae38cc6c4ec8e3d13f26d12f85bca561f64f0f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 9 Jun 2011 13:46:34 +0000 Subject: fix for own mistake & fix some comments. --- source/blender/blenloader/intern/readfile.c | 7 ++----- source/blender/makesrna/intern/rna_internal_types.h | 3 ++- source/blender/nodes/intern/CMP_nodes/CMP_math.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1dc02c4b866..9d3035057ba 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5642,11 +5642,10 @@ static BHead *read_data_into_oldnewmap(FileData *fd, BHead *bhead, const char *a 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 @@ static int object_in_any_scene(Main *mainvar, Object *ob) 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 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const } } -/* 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; diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index 6ff7bc20b05..249833ae94b 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -179,7 +179,8 @@ struct PropertyRNA { * 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; }; diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_math.c b/source/blender/nodes/intern/CMP_nodes/CMP_math.c index 96fa13d99f0..b7a67f3563b 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_math.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_math.c @@ -144,7 +144,7 @@ static void do_math(bNode *node, float *out, float *in, float *in2) 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; -- cgit v1.2.3