diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-08 10:32:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-08 10:32:00 +0400 |
commit | 6fd187e4df1133b273ee2e5c1bbb3b8a9f31e73e (patch) | |
tree | ff3e9899dc31ffa5190c3ad5990b72a6edb14b54 /source/blender/render/intern/raytrace | |
parent | 1d5b7bc1f795096d1eee69378b9b924560b9b20d (diff) |
code cleanup: 0 --> NULL
Diffstat (limited to 'source/blender/render/intern/raytrace')
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject.cpp | 2 | ||||
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index b31aff82777..9e639501fdd 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -87,7 +87,7 @@ MALWAYS_INLINE void rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, RayObject *RE_rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, VlakRen *vlr) { - return rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : 0); + return rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : NULL); } RayObject *RE_rayface_from_coords(RayFace *rayface, void *ob, void *face, float *v1, float *v2, float *v3, float *v4) diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 4195b103811..1d67a8c4f44 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -50,15 +50,15 @@ static bool selected_node(RTBuilder::Object *node) static void rtbuild_init(RTBuilder *b) { b->split_axis = -1; - b->primitives.begin = 0; - b->primitives.end = 0; + b->primitives.begin = NULL; + b->primitives.end = NULL; b->primitives.maxsize = 0; for (int i = 0; i < RTBUILD_MAX_CHILDS; i++) b->child_offset[i] = 0; for (int i = 0; i < 3; i++) - b->sorted_begin[i] = b->sorted_end[i] = 0; + b->sorted_begin[i] = b->sorted_end[i] = NULL; INIT_MINMAX(b->bb, b->bb + 3); } @@ -178,8 +178,8 @@ RTBuilder *rtbuild_get_child(RTBuilder *b, int child, RTBuilder *tmp) tmp->sorted_end[i] = b->sorted_begin[i] + b->child_offset[child + 1]; } else { - tmp->sorted_begin[i] = 0; - tmp->sorted_end[i] = 0; + tmp->sorted_begin[i] = NULL; + tmp->sorted_end[i] = NULL; } return tmp; |