Revision: 35362
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35362
Author: campbellbarton
Date: 2011-03-05 10:29:10 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
use NULL rather then 0 for pointer assignments & comparison, modifier, imbuf &
editors.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/physics/particle_object.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
trunk/blender/source/blender/editors/space_console/console_ops.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/filetype.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
trunk/blender/source/blender/modifiers/intern/MOD_none.c
trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_softbody.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/blender/modifiers/intern/MOD_surface.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2011-03-05 09:27:14 UTC
(rev 35361)
+++ trunk/blender/source/blender/avi/intern/avi.c 2011-03-05 10:29:10 UTC
(rev 35362)
@@ -216,7 +216,7 @@
int AVI_is_avi (const char *name) {
int temp, fcca, j;
- AviMovie movie= {0};
+ AviMovie movie= {NULL};
AviMainHeader header;
AviBitmapInfoHeader bheader;
int movie_tracks = 0;
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2011-03-05 09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2011-03-05 10:29:10 UTC (rev 35362)
@@ -1039,7 +1039,7 @@
}
if(y1 < 0) { /* XXX butregion NULL check?, there is one above */
int newy1;
- UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2
+ ofsy, 0, &newy1);
+ UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2
+ ofsy, NULL, &newy1);
newy1 += butregion->winrct.ymin;
y2= y2-y1 + newy1;
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2011-03-05 09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2011-03-05 10:29:10 UTC (rev 35362)
@@ -383,12 +383,12 @@
if(id->lib) {
if(id->flag & LIB_INDIRECT) {
- but= uiDefIconBut(block, BUT, 0,
ICON_LIBRARY_DATA_INDIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0,
+ but= uiDefIconBut(block, BUT, 0,
ICON_LIBRARY_DATA_INDIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, NULL, 0, 0, 0, 0,
"Indirect library datablock, cannot
change.");
uiButSetFlag(but, UI_BUT_DISABLED);
}
else {
- but= uiDefIconBut(block, BUT, 0,
ICON_LIBRARY_DATA_DIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0,
+ but= uiDefIconBut(block, BUT, 0,
ICON_LIBRARY_DATA_DIRECT, 0,0,UI_UNIT_X,UI_UNIT_Y, NULL, 0, 0, 0, 0,
"Direct linked library datablock, click
to make local.");
if(!id_make_local(id, 1 /* test */) || (idfrom
&& idfrom->lib))
uiButSetFlag(but, UI_BUT_DISABLED);
@@ -403,9 +403,9 @@
sprintf(str, "%d", id->us);
if(id->us<10)
- but= uiDefBut(block, BUT, 0, str,
0,0,UI_UNIT_X,UI_UNIT_Y, 0, 0, 0, 0, 0, "Displays number of users of this data.
Click to make a single-user copy.");
+ but= uiDefBut(block, BUT, 0, str,
0,0,UI_UNIT_X,UI_UNIT_Y, NULL, 0, 0, 0, 0, "Displays number of users of this
data. Click to make a single-user copy.");
else
- but= uiDefBut(block, BUT, 0, str,
0,0,UI_UNIT_X+10,UI_UNIT_Y, 0, 0, 0, 0, 0, "Displays number of users of this
data. Click to make a single-user copy.");
+ but= uiDefBut(block, BUT, 0, str,
0,0,UI_UNIT_X+10,UI_UNIT_Y, NULL, 0, 0, 0, 0, "Displays number of users of this
data. Click to make a single-user copy.");
uiButSetNFunc(but, template_id_cb,
MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ALONE));
if(!id_copy(id, NULL, 1 /* test only */) || (idfrom &&
idfrom->lib))
@@ -456,7 +456,7 @@
if(unlinkop) {
but= uiDefIconButO(block, BUT, unlinkop,
WM_OP_INVOKE_REGION_WIN, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL);
/* so we can access the template from operators, font
unlinking needs this */
- uiButSetNFunc(but, NULL, MEM_dupallocN(template), 0);
+ uiButSetNFunc(but, NULL, MEM_dupallocN(template), NULL);
}
else {
but= uiDefIconBut(block, BUT, 0, ICON_X, 0, 0,
UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, "Unlink datablock. Shift + Click to set
users to zero, data gets not saved");
@@ -1265,15 +1265,15 @@
if(coba==NULL) return;
- bt= uiDefBut(block, BUT, 0, "Add",
0+xoffs,100+yoffs,40,20, 0, 0, 0, 0, 0, "Add a new color stop to the
colorband");
+ bt= uiDefBut(block, BUT, 0, "Add",
0+xoffs,100+yoffs,40,20, NULL, 0, 0, 0, 0, "Add a new color stop to the
colorband");
uiButSetNFunc(bt, colorband_add_cb, MEM_dupallocN(cb), coba);
- bt= uiDefBut(block, BUT, 0, "Delete",
45+xoffs,100+yoffs,45,20, 0, 0, 0, 0, 0, "Delete the active position");
+ bt= uiDefBut(block, BUT, 0, "Delete",
45+xoffs,100+yoffs,45,20, NULL, 0, 0, 0, 0, "Delete the active position");
uiButSetNFunc(bt, colorband_del_cb, MEM_dupallocN(cb), coba);
/* XXX, todo for later - convert to operator - campbell */
- bt= uiDefBut(block, BUT, 0, "F",
95+xoffs,100+yoffs,20,20, 0, 0, 0, 0, 0, "Flip colorband");
+ bt= uiDefBut(block, BUT, 0, "F",
95+xoffs,100+yoffs,20,20, NULL, 0, 0, 0, 0, "Flip colorband");
uiButSetNFunc(bt, colorband_flip_cb, MEM_dupallocN(cb), coba);
uiDefButS(block, NUM, 0, "",
120+xoffs,100+yoffs,80, 20, &coba->cur, 0.0, (float)(MAX2(0, coba->tot-1)), 0,
0, "Choose active color stop");
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2011-03-05
09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2011-03-05
10:29:10 UTC (rev 35362)
@@ -1006,7 +1006,7 @@
/* set matrix on all appropriate axes */
wmOrtho2(curmasked.xmin-xofs, curmasked.xmax-xofs, curmasked.ymin-yofs,
curmasked.ymax-yofs);
-
+
/* XXX is this necessary? */
glLoadIdentity();
}
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2011-03-05
09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_add.c 2011-03-05
10:29:10 UTC (rev 35362)
@@ -1047,7 +1047,7 @@
static void curvetomesh(Scene *scene, Object *ob)
{
- if(ob->disp.first==0)
+ if(ob->disp.first == NULL)
makeDispListCurveTypes(scene, ob, 0); /* force creation */
nurbs_to_mesh(ob); /* also does users */
@@ -1213,19 +1213,19 @@
if(cu->vfont) {
cu->vfont->id.us--;
- cu->vfont= 0;
+ cu->vfont= NULL;
}
if(cu->vfontb) {
cu->vfontb->id.us--;
- cu->vfontb= 0;
+ cu->vfontb= NULL;
}
if(cu->vfonti) {
cu->vfonti->id.us--;
- cu->vfonti= 0;
+ cu->vfonti= NULL;
}
if(cu->vfontbi) {
cu->vfontbi->id.us--;
- cu->vfontbi= 0;
+ cu->vfontbi= NULL;
}
if (!keep_original) {
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2011-03-05
09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2011-03-05
10:29:10 UTC (rev 35362)
@@ -315,7 +315,7 @@
}
else {
ListBase threads;
- BakeRender bkr= {0};
+ BakeRender bkr= {NULL};
init_bake_internal(&bkr, C);
bkr.reports= op->reports;
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2011-03-05
09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2011-03-05
10:29:10 UTC (rev 35362)
@@ -1797,7 +1797,7 @@
int tot=0, a;
short offset=25;
- if(BASACT==0 || v3d==NULL) return;
+ if(BASACT==NULL || v3d==NULL) return;
// XXX if(button(&offset, 0, 1000,"Total time")==0) return;
/* make array of all bases, xco yco (screen) */
@@ -1835,7 +1835,7 @@
{
float offset=0.0f;
- if(BASACT==0 || v3d==NULL) return;
+ if(BASACT==NULL || v3d==NULL) return;
// XXX if(fbutton(&offset, -10000.0f, 10000.0f, 10, 10, "Offset")==0) return;
@@ -1855,7 +1855,7 @@
Base *base;
float rand_ofs=0.0f;
- if(BASACT==0 || v3d==NULL) return;
+ if(BASACT==NULL || v3d==NULL) return;
// XXX if(fbutton(&rand_ofs, 0.0f, 10000.0f, 10, 10, "Randomize")==0) return;
Modified: trunk/blender/source/blender/editors/object/object_lattice.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_lattice.c
2011-03-05 09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_lattice.c
2011-03-05 10:29:10 UTC (rev 35362)
@@ -323,7 +323,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; short dist, select, mval[2]; } data = {0};
+ struct { BPoint *bp; short dist, select, mval[2]; } data = {NULL};
data.dist = 100;
data.select = sel;
Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c
2011-03-05 09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_modifier.c
2011-03-05 10:29:10 UTC (rev 35362)
@@ -296,7 +296,7 @@
psys=((ParticleSystemModifierData *)md)->psys;
part= psys->part;
- if(part->ren_as != PART_DRAW_PATH || psys->pathcache == 0)
+ if(part->ren_as != PART_DRAW_PATH || psys->pathcache == NULL)
return 0;
totpart= psys->totcached;
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c
2011-03-05 09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_relations.c
2011-03-05 10:29:10 UTC (rev 35362)
@@ -1427,7 +1427,7 @@
for(a=0; a<totcol; a++) {
id= (ID *)matar[a];
- if(id && id->lib==0) {
+ if(id && id->lib == NULL) {
if(id->newid) {
matar[a]= (Material *)id->newid;
id_us_plus(id->newid);
@@ -1581,7 +1581,7 @@
Tex *tex, *texn;
tex= *from;
- if(tex==0) return;
+ if(tex==NULL) return;
if(tex->id.newid) {
*from= (Tex *)tex->id.newid;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c 2011-03-05
09:27:14 UTC (rev 35361)
+++ trunk/blender/source/blender/editors/object/object_select.c 2011-03-05
10:29:10 UTC (rev 35362)
@@ -187,7 +187,7 @@
Object *ob;
void *obdata = NULL;
Material *mat = NULL, *mat1;
- Tex *tex=0;
+ Tex *tex= NULL;
int a, b;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
