[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35337] trunk/blender/source/blender: use NULL instead of 0 for pointers, (editors)
Campbell Barton
ideasman42 at gmail.com
Thu Mar 3 18:59:04 CET 2011
Revision: 35337
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35337
Author: campbellbarton
Date: 2011-03-03 17:59:04 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
use NULL instead of 0 for pointers, (editors)
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -820,7 +820,7 @@
bAction *act= pld->act;
bActionGroup *agrp;
- KeyframeEditData ked= {{0}};
+ KeyframeEditData ked= {{NULL}};
KeyframeEditFunc group_ok_cb;
int frame= 1;
@@ -1455,7 +1455,7 @@
/* change active pose setting */
act->active_marker= BLI_findindex(&act->markers, marker) + 1;
- action_set_activemarker(act, marker, 0);
+ action_set_activemarker(act, marker, NULL);
/* Update event for pose and deformation children */
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -1069,7 +1069,7 @@
CVKeyIndex *keyIndex;
char rna_path[64], orig_rna_path[64];
AnimData *ad= BKE_animdata_from_id(&cu->id);
- ListBase curves= {0, 0};
+ ListBase curves= {NULL, NULL};
FCurve *fcu, *next;
while(nu) {
@@ -2466,7 +2466,7 @@
int a;
short sel;
- if(obedit==0) return;
+ if(obedit==NULL) return;
cu= (Curve*)obedit->data;
cu->lastsel= NULL;
@@ -3315,7 +3315,7 @@
/* sel==1: selected gets a disadvantage */
/* in nurb and bezt or bp the nearest is written */
/* return 0 1 2: handlepunt */
- struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; int dist, hpoint, select, mval[2]; } data = {0};
+ struct { BPoint *bp; BezTriple *bezt; Nurb *nurb; int dist, hpoint, select, mval[2]; } data = {NULL};
data.dist = 100;
data.hpoint = 0;
@@ -3342,24 +3342,24 @@
BPoint *bp1;
int a;
- *nu= 0;
- *bezt= 0;
- *bp= 0;
+ *nu= NULL;
+ *bezt= NULL;
+ *bp= NULL;
for(nu1= editnurb->first; nu1; nu1= nu1->next) {
if(nu1->type == CU_BEZIER) {
bezt1= nu1->bezt;
a= nu1->pntsu;
while(a--) {
if( (bezt1->f1 & SELECT) || (bezt1->f2 & SELECT) || (bezt1->f3 & SELECT) ) {
- if(*nu!=0 && *nu!= nu1) {
- *nu= 0;
- *bp= 0;
- *bezt= 0;
+ if(*nu != NULL && *nu != nu1) {
+ *nu= NULL;
+ *bp= NULL;
+ *bezt= NULL;
return;
}
else if(*bezt || *bp) {
- *bp= 0;
- *bezt= 0;
+ *bp= NULL;
+ *bezt= NULL;
}
else {
*bezt= bezt1;
@@ -3374,15 +3374,15 @@
a= nu1->pntsu*nu1->pntsv;
while(a--) {
if( bp1->f1 & 1 ) {
- if(*nu!=0 && *nu!= nu1) {
- *bp= 0;
- *bezt= 0;
- *nu= 0;
+ if(*nu != NULL && *nu != nu1) {
+ *bp= NULL;
+ *bezt= NULL;
+ *nu= NULL;
return;
}
else if(*bezt || *bp) {
- *bp= 0;
- *bezt= 0;
+ *bp= NULL;
+ *bezt= NULL;
}
else {
*bp= bp1;
@@ -3421,7 +3421,7 @@
bezt++;
}
MEM_freeN(nu->bp);
- nu->bp= 0;
+ nu->bp= NULL;
nu->pntsu= nr;
nu->type = CU_BEZIER;
calchandlesNurb(nu);
@@ -3521,7 +3521,7 @@
bezt++;
}
MEM_freeN(nu->bp);
- nu->bp= 0;
+ nu->bp= NULL;
MEM_freeN(nu->knotsu);
nu->knotsu= NULL;
nu->pntsu= nr;
@@ -3726,12 +3726,12 @@
float vec[3];
} NurbSort;
-static ListBase nsortbase= {0, 0};
+static ListBase nsortbase= {NULL, NULL};
/* static NurbSort *nusmain; */ /* this var seems to go unused... at least in this file */
static void make_selection_list_nurb(ListBase *editnurb)
{
- ListBase nbase= {0, 0};
+ ListBase nbase= {NULL, NULL};
NurbSort *nus, *nustest, *headdo, *taildo;
Nurb *nu;
BPoint *bp;
@@ -3766,7 +3766,7 @@
while(nbase.first) {
headdist= taildist= 1.0e30;
- headdo= taildo= 0;
+ headdo= taildo= NULL;
nustest= nbase.first;
while(nustest) {
@@ -3977,7 +3977,7 @@
Object *obedit= CTX_data_edit_object(C);
Curve *cu= obedit->data;
ListBase *nubase= curve_get_editcurve(obedit);
- Nurb *nu, *nu1=0, *nu2=0;
+ Nurb *nu, *nu1=NULL, *nu2=NULL;
BPoint *bp;
float *fp, offset;
int a, ok= 0;
@@ -4012,7 +4012,7 @@
if((nu->flagu & CU_NURB_CYCLIC)==0) { /* not cyclic */
if(nu->type == CU_BEZIER) {
- if(nu1==0) {
+ if(nu1==NULL) {
if( BEZSELECTED_HIDDENHANDLES(cu, nu->bezt) ) nu1= nu;
else {
if( BEZSELECTED_HIDDENHANDLES(cu, &(nu->bezt[nu->pntsu-1])) ) {
@@ -4022,7 +4022,7 @@
}
}
}
- else if(nu2==0) {
+ else if(nu2==NULL) {
if( BEZSELECTED_HIDDENHANDLES(cu, nu->bezt) ) {
nu2= nu;
switchdirectionNurb(nu);
@@ -4038,7 +4038,7 @@
}
else if(nu->pntsv==1) {
bp= nu->bp;
- if(nu1==0) {
+ if(nu1==NULL) {
if( bp->f1 & SELECT) nu1= nu;
else {
bp= bp+(nu->pntsu-1);
@@ -4049,7 +4049,7 @@
}
}
}
- else if(nu2==0) {
+ else if(nu2==NULL) {
if( bp->f1 & SELECT ) {
nu2= nu;
switchdirectionNurb(nu);
@@ -4175,8 +4175,8 @@
ListBase *editnurb= curve_get_editcurve(obedit);
ViewContext vc;
Nurb *nu;
- BezTriple *bezt=0;
- BPoint *bp=0;
+ BezTriple *bezt=NULL;
+ BPoint *bp=NULL;
int location[2];
short hand;
@@ -4475,7 +4475,7 @@
mul_m3_v3(imat,newbp->vec);
newbp->vec[3]= 1.0;
- newnu->knotsu= newnu->knotsv= 0;
+ newnu->knotsu= newnu->knotsv= NULL;
nurbs_knot_calc_u(newnu);
ok= 1;
@@ -4541,7 +4541,7 @@
bezt= newbezt;
ok= 1;
}
- else bezt= 0;
+ else bezt= NULL;
if(bezt) {
if(!newnu) nu->pntsu++;
@@ -4612,7 +4612,7 @@
bp= newbp;
ok= 1;
}
- else bp= 0;
+ else bp= NULL;
if(bp) {
if(mode=='e') {
@@ -5031,13 +5031,13 @@
Object *obedit= CTX_data_edit_object(C);
Curve *cu= obedit->data;
ListBase *editnurb= curve_get_editcurve(obedit);
- static BPoint *last=0;
+ static BPoint *last= NULL;
static int direction=0;
Nurb *nu;
BPoint *bp;
int u = 0, v = 0, a, b, ok=0;
- if(editnurb->first==0)
+ if(editnurb->first == NULL)
return OPERATOR_CANCELLED;
if(cu->lastsel==NULL)
return OPERATOR_CANCELLED;
@@ -6065,7 +6065,7 @@
float imat[4][4], cmat[4][4];
int a;
- tempbase.first= tempbase.last= 0;
+ tempbase.first= tempbase.last= NULL;
/* trasnform all selected curves inverse in obact */
invert_m4_m4(imat, ob->obmat);
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -500,7 +500,7 @@
continue;
if (!(dflag & GP_DRAWDATA_ONLYI2D) && (gps->flag & GP_STROKE_2DIMAGE))
continue;
- if ((gps->points == 0) || (gps->totpoints < 1))
+ if ((gps->points == NULL) || (gps->totpoints < 1))
continue;
/* check which stroke-drawer to use */
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -2194,7 +2194,7 @@
if(bt->next && bt->next->alignnr == nr && buts_are_horiz(bt, bt->next)==0 ) break;
bt= bt->next;
}
- if(bt==0 || bt->alignnr != nr) flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_RIGHT;
+ if(bt==NULL || bt->alignnr != nr) flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_RIGHT;
}
}
else flag |= UI_BUT_ALIGN_LEFT;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -4459,7 +4459,7 @@
return WM_UI_HANDLER_BREAK;
}
}
- else if(but->pointype && but->poin==0) {
+ else if(but->pointype && but->poin==NULL) {
/* there's a pointer needed */
BKE_reportf(NULL, RPT_WARNING, "DoButton pointer error: %s", but->str);
button_activate_state(C, but, BUTTON_STATE_EXIT);
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -164,7 +164,7 @@
int a;
me= get_mesh(ob);
- if(me==0 || me->totface==0) return;
+ if(me==NULL || me->totface==0) return;
mface= me->mface;
a= me->totface;
@@ -193,7 +193,7 @@
int a;
me= get_mesh(ob);
- if(me==0 || me->totface==0) return;
+ if(me==NULL || me->totface==0) return;
mface= me->mface;
a= me->totface;
@@ -333,7 +333,7 @@
unsigned int index=0;
me = get_mesh(ob);
- if(me==0 || me->totface==0) return;
+ if(me==NULL || me->totface==0) return;
if (mode==0 || mode==1) {
// XXX - Causes glitches, not sure why
@@ -356,7 +356,7 @@
int a;
me= get_mesh(ob);
- if(me==0) return;
+ if(me==NULL) return;
if(action == SEL_INVERT) {
mface= me->mface;
Modified: trunk/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- trunk/blender/source/blender/editors/space_time/space_time.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/space_time/space_time.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -269,7 +269,7 @@
/* helper for time_draw_keyframes() */
static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel)
{
- bDopeSheet ads= {0};
+ bDopeSheet ads= {NULL};
DLRBT_Tree keys;
ActKeyColumn *ak;
Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2011-03-03 17:58:06 UTC (rev 35336)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c 2011-03-03 17:59:04 UTC (rev 35337)
@@ -86,7 +86,7 @@
int *flags_p;
if (!BLI_edgehash_haskey(eh, v0, v1)) {
- BLI_edgehash_insert(eh, v0, v1, 0);
+ BLI_edgehash_insert(eh, v0, v1, NULL);
}
flags_p = (int*) BLI_edgehash_lookup_p(eh, v0, v1);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list