griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for own mistake & fix some comments.

Browse Source
This commit is contained in:
Campbell Barton
2011-06-09 13:46:34 +00:00
parent 21f5a87999
commit d4ae38cc6c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenloader/intern/readfile.c
View File

@@ -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;

3
source/blender/makesrna/intern/rna_internal_types.h
View File

@@ -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;
};

2
source/blender/nodes/intern/CMP_nodes/CMP_math.c
View File

@@ -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;