sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

use zero initializers instead of memset(), also change PointerRNA_NULL from an extern into a define.

Browse Source
This commit is contained in:
Campbell Barton 2010-11-23 08:44:21 +00:00
parent 225be0cf30
commit ce2295999e
12 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/avi/intern/avi.c
View File

@ -213,15 +213,13 @@ int AVI_is_avi (char *name) {
int AVI_is_avi (const char *name) {
int temp, fcca, j;
AviMovie movie;
AviMovie movie= {0};
AviMainHeader header;
AviBitmapInfoHeader bheader;
int movie_tracks = 0;
DEBUG_PRINT("opening movie\n");
memset(&movie, 0, sizeof(AviMovie));
movie.type = AVI_MOVIE_READ;
movie.fp = fopen (name, "rb");
movie.offset_table = NULL;

6
source/blender/blenkernel/intern/anim.c
View File

@ -1441,7 +1441,7 @@ static Object *find_family_object(Object **obar, char *family, char ch)
static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, int animated)
{
Object *ob, *obar[256];
Object *ob, *obar[256]= {0};
Curve *cu;
struct chartrans *ct, *chartransdata;
float vec[3], obmat[4][4], pmat[4][4], fsize, xof, yof;
@ -1456,9 +1456,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int level, i
chartransdata= BKE_text_to_curve(scene, par, FO_DUPLI);
if(chartransdata==0) return;
memset(obar, 0, 256*sizeof(void *));
cu= par->data;
slen= strlen(cu->str);
fsize= cu->fsize;

7
source/blender/blenkernel/intern/anim_sys.c
View File

@ -1610,9 +1610,6 @@ void nladata_flush_channels (ListBase *channels)
*/
static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime)
{
ListBase dummy_trackslist = {NULL, NULL};
NlaStrip dummy_strip;
NlaTrack *nlt;
short track_index=0;
short has_strips = 0;
@ -1655,7 +1652,9 @@ static void animsys_evaluate_nla (PointerRNA *ptr, AnimData *adt, float ctime)
/* if there are strips, evaluate action as per NLA rules */
if ((has_strips) || (adt->actstrip)) {
/* make dummy NLA strip, and add that to the stack */
memset(&dummy_strip, 0, sizeof(NlaStrip));
NlaStrip dummy_strip= {0};
ListBase dummy_trackslist;
dummy_trackslist.first= dummy_trackslist.last= &dummy_strip;
if ((nlt) && !(adt->flag & ADT_NLA_EDIT_NOMAP)) {

6
source/blender/editors/animation/keyframing.c
View File

@ -287,13 +287,12 @@ int insert_bezt_fcurve (FCurve *fcu, BezTriple *bezt, short flag)
*/
int insert_vert_fcurve (FCurve *fcu, float x, float y, short flag)
{
BezTriple beztr;
BezTriple beztr= {{{0}}};
int a;
/* set all three points, for nicer start position
* NOTE: +/- 1 on vec.x for left and right handles is so that 'free' handles work ok...
*/
memset(&beztr, 0, sizeof(BezTriple));
beztr.vec[0][0]= x-1.0f;
beztr.vec[0][1]= y;
beztr.vec[1][0]= x;
@ -1355,7 +1354,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
PointerRNA ptr;
PointerRNA ptr= {{0}};
PropertyRNA *prop= NULL;
char *path;
float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
@ -1367,7 +1366,6 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
flag = ANIM_get_keyframing_flags(scene, 1);
/* try to insert keyframe using property retrieved from UI */
memset(&ptr, 0, sizeof(PointerRNA));
uiContextActiveProperty(C, &ptr, &prop, &index);
if ((ptr.id.data && ptr.data && prop) && RNA_property_animateable(&ptr, prop)) {

4
source/blender/editors/object/object_relations.c
View File

@ -357,7 +357,7 @@ static int make_proxy_exec (bContext *C, wmOperator *op)
/* Generic itemf's for operators that take library args */
static EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSED(ptr), int *free)
{
EnumPropertyItem *item= NULL, item_tmp;
EnumPropertyItem item_tmp= {0}, *item= NULL;
int totitem= 0;
int i= 0;
Object *ob= ED_object_active_context(C);
@ -366,8 +366,6 @@ static EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA *UNUSE
if(!ob || !ob->dup_group)
return DummyRNA_DEFAULT_items;
memset(&item_tmp, 0, sizeof(item_tmp));
/* find the object to affect */
for (go= ob->dup_group->gobject.first; go; go= go->next) {
item_tmp.identifier= item_tmp.name= go->ob->id.name+2;

3
source/blender/editors/render/render_preview.c
View File

@ -1085,14 +1085,13 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
if(idtype == ID_IM) {
Image *ima= (Image*)id;
ImBuf *ibuf= NULL;
ImageUser iuser;
ImageUser iuser= {0};
/* ima->ok is zero when Image cannot load */
if(ima==NULL || ima->ok==0)
return;
/* setup dummy image user */
memset(&iuser, 0, sizeof(ImageUser));
iuser.ok= iuser.framenr= 1;
iuser.scene= sp->scene;

4
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -5412,13 +5412,11 @@ static int texture_paint_camera_project_exec(bContext *C, wmOperator *op)
{
Image *image= BLI_findlink(&CTX_data_main(C)->image, RNA_enum_get(op->ptr, "image"));
Scene *scene= CTX_data_scene(C);
ProjPaintState ps;
ProjPaintState ps= {0};
int orig_brush_size;
IDProperty *idgroup;
IDProperty *view_data= NULL;
memset(&ps, 0, sizeof(ps));
project_state_init(C, OBACT, &ps);
if(ps.ob==NULL || ps.ob->type != OB_MESH) {

3
source/blender/imbuf/intern/iris.c
View File

@ -175,9 +175,8 @@ static void readheader(FILE *inf, IMAGE *image)
static int writeheader(FILE *outf, IMAGE *image)
{
IMAGE t;
IMAGE t= {0};
memset(&t, 0, sizeof(IMAGE));
fwrite(&t,sizeof(IMAGE),1,outf);
fseek(outf,0,SEEK_SET);
putshort(outf,image->imagic);

2
source/blender/makesrna/RNA_access.h
View File

@ -583,7 +583,7 @@ void RNA_pointer_create(struct ID *id, StructRNA *type, void *data, PointerRNA *
void RNA_blender_rna_pointer_create(PointerRNA *r_ptr);
void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr);
extern PointerRNA PointerRNA_NULL;
#define PointerRNA_NULL ((PointerRNA){{0}})
/* Structs */

21
source/blender/makesrna/intern/rna_access.c
View File

@ -90,8 +90,6 @@ void RNA_exit()
/* Pointer */
PointerRNA PointerRNA_NULL = {{0}, 0, 0};
void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr)
{
r_ptr->id.data= NULL;
@ -168,9 +166,8 @@ void RNA_blender_rna_pointer_create(PointerRNA *r_ptr)
PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *data)
{
PointerRNA result;
if(data) {
PointerRNA result;
result.data= data;
result.type= type;
rna_pointer_inherit_id(type, ptr, &result);
@ -183,11 +180,11 @@ PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *da
else
result.type= type;
}
return result;
}
else {
return PointerRNA_NULL;
}
else
memset(&result, 0, sizeof(result));
return result;
}
/**/
@ -1972,8 +1969,7 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop)
return RNA_property_pointer_get(ptr, prop);
}
else {
PointerRNA result= {{0}};
return result;
return PointerRNA_NULL;
}
}
@ -3561,12 +3557,9 @@ PointerRNA RNA_pointer_get(PointerRNA *ptr, const char *name)
return RNA_property_pointer_get(ptr, prop);
}
else {
PointerRNA result;
printf("RNA_pointer_get: %s.%s not found.\n", ptr->type->identifier, name);
memset(&result, 0, sizeof(result));
return result;
return PointerRNA_NULL;
}
}

3
source/blender/python/intern/bpy_rna.c
View File

@ -1156,8 +1156,7 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
else {
/* data==NULL, assign to RNA */
if(value == Py_None) {
PointerRNA valueptr;
memset(&valueptr, 0, sizeof(valueptr));
PointerRNA valueptr= {{0}};
RNA_property_pointer_set(ptr, prop, valueptr);
}
else if(RNA_struct_is_a(param->ptr.type, ptype)) {

4
source/blender/windowmanager/intern/wm_operators.c
View File

@ -3426,12 +3426,10 @@ void wm_window_keymap(wmKeyConfig *keyconf)
/* Generic itemf's for operators that take library args */
static EnumPropertyItem *rna_id_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), int *free, ID *id, int local)
{
EnumPropertyItem *item= NULL, item_tmp;
EnumPropertyItem item_tmp= {0}, *item= NULL;
int totitem= 0;
int i= 0;
memset(&item_tmp, 0, sizeof(item_tmp));
for( ; id; id= id->next) {
if(local==FALSE || id->lib==NULL) {
item_tmp.identifier= item_tmp.name= id->name+2;