diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 20:58:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-03 20:58:06 +0300 |
commit | 709c727c510a85426b87a9a2fb7fb8517fef7de9 (patch) | |
tree | c4664d4773eb77cbf38ee264e9189a6557a310c4 /source/blender/blenkernel/intern | |
parent | 3326c0ca7523f5596a8ff96cb90a54b92e50ac5f (diff) |
replace 0 with NULL when used as a pointer
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/world.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 0b3d6dd4390..25354f2f239 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1411,7 +1411,7 @@ void make_local_object(Object *ob) if(ob->id.us==1) { ob->id.lib= NULL; ob->id.flag= LIB_LOCAL; - new_id(0, (ID *)ob, 0); + new_id(NULL, (ID *)ob, NULL); } else { @@ -1430,9 +1430,9 @@ void make_local_object(Object *ob) } if(local && lib==0) { - ob->id.lib= 0; + ob->id.lib= NULL; ob->id.flag= LIB_LOCAL; - new_id(0, (ID *)ob, 0); + new_id(NULL, (ID *)ob, NULL); } else if(local && lib) { obn= copy_object(ob); @@ -1440,7 +1440,7 @@ void make_local_object(Object *ob) sce= bmain->scene.first; while(sce) { - if(sce->id.lib==0) { + if(sce->id.lib==NULL) { base= sce->base.first; while(base) { if(base->object==ob) { diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index bf35baa4977..c70a02ac457 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1398,7 +1398,7 @@ static PTCacheMem *ptcache_disk_frame_to_mem(PTCacheID *pid, int cfra) unsigned int i, error = 0; if(pf == NULL) - return 0; + return NULL; if(!ptcache_file_header_begin_read(pf)) error = 1; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index fc864e2c11c..5b6c6bf8732 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -558,7 +558,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM //Using vertexs positions/normals as if a subsurface was applied if(smd->subsurfLevels) { - SubsurfModifierData ssmd= {{0}}; + SubsurfModifierData ssmd= {{NULL}}; ssmd.subdivType = ME_CC_SUBSURF; //catmull clark ssmd.levels = smd->subsurfLevels; //levels diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 1f9a9ccdc3c..54bd4a86a5e 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1364,7 +1364,7 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, v CCGSubSurf *ss = ccgdm->ss; CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss); GPUVertexAttribs gattribs; - DMVertexAttribs attribs= {{{0}}}; + DMVertexAttribs attribs= {{{NULL}}}; MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); int gridSize = ccgSubSurf_getGridSize(ss); int gridFaces = gridSize - 1; diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 658b6ddaa98..ff58e8bd0a4 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -160,7 +160,7 @@ void make_local_world(World *wrld) } if(local && lib==0) { - wrld->id.lib= 0; + wrld->id.lib= NULL; wrld->id.flag= LIB_LOCAL; new_id(NULL, (ID *)wrld, NULL); } |