Revision: 58980
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58980
Author: campbellbarton
Date: 2013-08-07 03:30:23 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
code cleanup: use NULL rather then zero for pointers
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/bake.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/multires_bake.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/render/intern/source/bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/bake.c 2013-08-06
23:47:47 UTC (rev 58979)
+++ trunk/blender/source/blender/render/intern/source/bake.c 2013-08-07
03:30:23 UTC (rev 58980)
@@ -577,7 +577,7 @@
if (bs->type == RE_BAKE_NORMALS && R.r.bake_normal_space ==
R_BAKE_SPACE_TANGENT)
bake_shade(handle, ob, shi, quad, x, y, u, v, tvn, ttang);
else
- bake_shade(handle, ob, shi, quad, x, y, u, v, 0, 0);
+ bake_shade(handle, ob, shi, quad, x, y, u, v, NULL, NULL);
}
static int get_next_bake_face(BakeShade *bs)
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c
2013-08-06 23:47:47 UTC (rev 58979)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c
2013-08-07 03:30:23 UTC (rev 58980)
@@ -726,7 +726,7 @@
float inp;
int a;
- if (vlr==0) return 0;
+ if (vlr == NULL) return 0;
asf= asv->faces.first;
while (asf) {
@@ -1289,7 +1289,7 @@
static void particle_curve(Render *re, ObjectRen *obr, DerivedMesh *dm,
Material *ma, ParticleStrandData *sd,
const float loc[3], const float loc1[3], int seed,
float *pa_co)
{
- HaloRen *har=0;
+ HaloRen *har = NULL;
if (ma->material_type == MA_TYPE_WIRE)
static_particle_wire(obr, ma, loc, loc1, sd->first, sd->line);
@@ -1466,7 +1466,7 @@
default:
{
- HaloRen *har=0;
+ HaloRen *har = NULL;
har = RE_inithalo_particle(re, obr, dm, ma, loc, NULL,
sd->orco, sd->uvco, hasize, 0.0, seed, pa_co);
@@ -1516,22 +1516,22 @@
{
Object *ob= obr->ob;
// Object *tob=0;
- Material *ma=0;
+ Material *ma = NULL;
ParticleSystemModifierData *psmd;
- ParticleSystem *tpsys=0;
- ParticleSettings *part, *tpart=0;
- ParticleData *pars, *pa=0, *tpa=0;
- ParticleKey *states=0;
+ ParticleSystem *tpsys = NULL;
+ ParticleSettings *part, *tpart = NULL;
+ ParticleData *pars, *pa = NULL, *tpa = NULL;
+ ParticleKey *states = NULL;
ParticleKey state;
- ParticleCacheKey *cache=0;
+ ParticleCacheKey *cache = NULL;
ParticleBillboardData bb;
- ParticleSimulationData sim = {0};
+ ParticleSimulationData sim = {NULL};
ParticleStrandData sd;
- StrandBuffer *strandbuf=0;
- StrandVert *svert=0;
- StrandBound *sbound= 0;
- StrandRen *strand=0;
- RNG *rng= 0;
+ StrandBuffer *strandbuf = NULL;
+ StrandVert *svert = NULL;
+ StrandBound *sbound = NULL;
+ StrandRen *strand = NULL;
+ RNG *rng = NULL;
float loc[3], loc1[3], loc0[3], mat[4][4], nmat[3][3], co[3], nor[3],
duplimat[4][4];
float strandlen=0.0f, curlen=0.0f;
float hasize, pa_size, r_tilt, r_length;
@@ -1542,7 +1542,7 @@
int totchild=0, step_nbr;
int seed, path_nbr=0, orco1=0, num;
int totface;
- char **uv_name=0;
+ char **uv_name = NULL;
const int *index_mf_to_mpoly = NULL;
const int *index_mp_to_orig = NULL;
@@ -1735,7 +1735,7 @@
}
}
- if (sd.orco == 0) {
+ if (sd.orco == NULL) {
sd.orco = MEM_mallocN(3 * sizeof(float), "particle orco");
orco1 = 1;
}
@@ -1760,10 +1760,17 @@
/* get orco */
if (tpsys && part->phystype == PART_PHYS_NO) {
tpa = tpsys->particles + pa->num;
- psys_particle_on_emitter(psmd, tpart->from,
tpa->num, pa->num_dmcache, tpa->fuv, tpa->foffset, co, nor, 0, 0, sd.orco, 0);
+ psys_particle_on_emitter(
+ psmd,
+ tpart->from, tpa->num, pa->num_dmcache,
tpa->fuv,
+ tpa->foffset, co, nor, NULL, NULL,
sd.orco, NULL);
}
- else
- psys_particle_on_emitter(psmd, part->from,
pa->num, pa->num_dmcache, pa->fuv, pa->foffset, co, nor, 0, 0, sd.orco, 0);
+ else {
+ psys_particle_on_emitter(
+ psmd,
+ part->from, pa->num, pa->num_dmcache,
+ pa->fuv, pa->foffset, co, nor, NULL,
NULL, sd.orco, NULL);
+ }
/* get uvco & mcol */
num= pa->num_dmcache;
@@ -1808,15 +1815,17 @@
/* get orco */
if (part->childtype == PART_CHILD_FACES) {
- psys_particle_on_emitter(psmd,
- PART_FROM_FACE, cpa->num,
DMCACHE_ISCHILD,
- cpa->fuv, cpa->foffset, co, nor, 0, 0,
sd.orco, 0);
+ psys_particle_on_emitter(
+ psmd,
+ PART_FROM_FACE, cpa->num,
DMCACHE_ISCHILD,
+ cpa->fuv, cpa->foffset, co, nor, NULL,
NULL, sd.orco, NULL);
}
else {
ParticleData *par = psys->particles +
cpa->parent;
- psys_particle_on_emitter(psmd, part->from,
- par->num, DMCACHE_ISCHILD, par->fuv,
- par->foffset, co, nor, 0, 0, sd.orco,
0);
+ psys_particle_on_emitter(
+ psmd,
+ part->from, par->num, DMCACHE_ISCHILD,
par->fuv,
+ par->foffset, co, nor, NULL, NULL,
sd.orco, NULL);
}
/* get uvco & mcol */
@@ -2419,7 +2428,7 @@
BKE_displist_make_mball_forRender(re->scene, ob, &dispbase);
dl= dispbase.first;
- if (dl==0) return;
+ if (dl == NULL) return;
data= dl->verts;
nors= dl->nors;
@@ -2464,7 +2473,7 @@
vlr->v1= RE_findOrAddVert(obr, index[0]);
vlr->v2= RE_findOrAddVert(obr, index[1]);
vlr->v3= RE_findOrAddVert(obr, index[2]);
- vlr->v4= 0;
+ vlr->v4 = NULL;
if (negative_scale)
normal_tri_v3(vlr->n, vlr->v1->co, vlr->v2->co,
vlr->v3->co);
@@ -2729,7 +2738,7 @@
vlr->v2= RE_findOrAddVert(obr,
vertofs+v2);
vlr->v3= RE_findOrAddVert(obr,
vertofs+v3);
if (v4) vlr->v4= RE_findOrAddVert(obr,
vertofs+v4);
- else vlr->v4= 0;
+ else vlr->v4 = NULL;
/* render normals are inverted in
render */
if (vlr->v4)
@@ -2787,7 +2796,7 @@
static void init_render_surf(Render *re, ObjectRen *obr, int timeoffset)
{
Object *ob= obr->ob;
- Nurb *nu=0;
+ Nurb *nu = NULL;
Curve *cu;
ListBase displist= {NULL, NULL};
DispList *dl;
@@ -2798,7 +2807,7 @@
cu= ob->data;
nu= cu->nurb.first;
- if (nu==0) return;
+ if (nu == NULL) return;
mul_m4_m4m4(mat, re->viewmat, ob->obmat);
invert_m4_m4(ob->imat, mat);
@@ -3311,7 +3320,7 @@
DerivedMesh *dm;
CustomDataMask mask;
float xn, yn, zn, imat[3][3], mat[4][4]; //nor[3],
- float *orco=0;
+ float *orco = NULL;
int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0,
need_origindex=0;
int a, a1, ok, vertofs;
int end, do_autosmooth = FALSE, totvert = 0;
@@ -3526,8 +3535,8 @@
vlr->v1=
RE_findOrAddVert(obr, vertofs+v1);
vlr->v2=
RE_findOrAddVert(obr, vertofs+v2);
vlr->v3=
RE_findOrAddVert(obr, vertofs+v3);
- if (v4) vlr->v4=
RE_findOrAddVert(obr, vertofs+v4);
- else vlr->v4= 0;
+ if (v4) vlr->v4 =
RE_findOrAddVert(obr, vertofs+v4);
+ else vlr->v4 = NULL;
#ifdef WITH_FREESTYLE
/* Freestyle edge/face
marks */
@@ -4706,7 +4715,8 @@
obi->duplitexmat= BLI_memarena_alloc(re->memArena,
sizeof(float)*4*4);
invert_m4_m4(imat, dob->mat);
- mul_serie_m4(obi->duplitexmat, re->viewmat, dob->omat, imat,
re->viewinv, 0, 0, 0, 0);
+ mul_serie_m4(obi->duplitexmat, re->viewmat, dob->omat, imat,
re->viewinv,
+ NULL, NULL, NULL, NULL);
}
if (dob) {
@@ -5068,7 +5078,7 @@
if (ob->flag & OB_DONE) {
if (ob->transflag & OB_RENDER_DUPLI) {
if (allow_render_object(re, ob, nolamps,
onlyselected, actob)) {
- init_render_object(re, ob, NULL, 0,
timeoffset);
+ init_render_object(re, ob, NULL, NULL,
timeoffset);
ob->transflag &= ~OB_RENDER_DUPLI;
if (ob->dup_group)
@@ -5128,7 +5138,7 @@
* it still needs to create the ObjectRen containing
the data */
if (ob->transflag & OB_RENDER_DUPLI) {
if (allow_render_object(re, ob, nolamps,
onlyselected, actob)) {
- init_render_object(re, ob, NULL, 0,
timeoffset);
+ init_render_object(re, ob, NULL, NULL,
timeoffset);
ob->transflag &= ~OB_RENDER_DUPLI;
}
}
@@ -5236,10 +5246,10 @@
free_object_duplilist(lb);
if (allow_render_object(re, ob, nolamps,
onlyselected, actob))
- init_render_object(re, ob, NULL, 0,
timeoffset);
+ init_render_object(re, ob, NULL, NULL,
timeoffset);
}
else if (allow_render_object(re, ob, nolamps,
onlyselected, actob))
- init_render_object(re, ob, NULL, 0, timeoffset);
+ init_render_object(re, ob, NULL, NULL,
timeoffset);
}
if (re->test_break(re->tbh)) break;
@@ -5327,7 +5337,7 @@
set_node_shader_lamp_loop(shade_material_loop);
/* MAKE RENDER DATA */
- database_init_objects(re, lay, 0, 0, 0, 0);
+ database_init_objects(re, lay, 0, 0, NULL, 0);
if (!re->test_break(re->tbh)) {
set_material_lightgroups(re);
@@ -5486,7 +5496,7 @@
}
/* MAKE RENDER DATA */
- database_init_objects(re, lay, 0, 0, 0, timeoffset);
+ database_init_objects(re, lay, 0, 0, NULL, timeoffset);
if (!re->test_break(re->tbh))
project_renderdata(re, projectverto, re->r.mode & R_PANORAMA,
0, 1);
Modified: trunk/blender/source/blender/render/intern/source/multires_bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/multires_bake.c
2013-08-06 23:47:47 UTC (rev 58979)
+++ trunk/blender/source/blender/render/intern/source/multires_bake.c
2013-08-07 03:30:23 UTC (rev 58980)
@@ -776,7 +776,7 @@
get_ccgdm_data(lores_dm, hires_dm,
height_data->orig_index_mf_to_mpoly,
height_data->orig_index_mp_to_orig,
- lvl, face_index, uv[0], uv[1], p1, 0);
+ lvl, face_index, uv[0], uv[1], p1, NULL);
if (height_data->ssdm) {
get_ccgdm_data(lores_dm, height_data->ssdm,
Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c
2013-08-06 23:47:47 UTC (rev 58979)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c
2013-08-07 03:30:23 UTC (rev 58980)
@@ -371,7 +371,7 @@
for (b = 0; b < TOTCHILD; b++) {
if (node->childflag & (1 << b)) {
a = node->child[b].face;
- occ_face(&tree->face[a], 0, 0, &area);
+ occ_face(&tree->face[a], NULL, NULL, &area);
occ += area * tree->occlusion[a];
if (indirect) madd_v3_v3fl(rad, tree->rad[a], area);
totarea += area;
@@ -521,7 +521,7 @@
occ_build_recursive(othread->tree, othread->node, othread->begin,
othread->end, othread->depth);
- return 0;
+ return NULL;
}
static void occ_build_recursive(OcclusionTree *tree, OccNode *node, int begin,
int end, int depth)
@@ -1244,7 +1244,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
