[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45162] trunk/blender/source/blender/ render/intern/raytrace: style cleanup: use NULL rather than 0 for raytrace code.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 26 10:58:32 CEST 2012
Revision: 45162
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45162
Author: campbellbarton
Date: 2012-03-26 08:58:17 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
style cleanup: use NULL rather than 0 for raytrace code.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/blender/render/intern/raytrace/svbvh.h
trunk/blender/source/blender/render/intern/raytrace/vbvh.h
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp 2012-03-26 08:58:17 UTC (rev 45162)
@@ -75,7 +75,7 @@
MALWAYS_INLINE void rayface_from_vlak(RayFace *rayface, ObjectInstanceRen *obi, VlakRen *vlr)
{
- rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : 0);
+ rayface_from_coords(rayface, obi, vlr, vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4 ? vlr->v4->co : NULL);
if (obi->transform_primitives)
{
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_empty.cpp 2012-03-26 08:58:17 UTC (rev 45162)
@@ -72,7 +72,7 @@
RE_rayobject_empty_hint_bb
};
-static RayObject empty_raytree = { &empty_api, {0, 0} };
+static RayObject empty_raytree = { &empty_api, {NULL, NULL} };
RayObject *RE_rayobject_empty_create()
{
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp 2012-03-26 08:58:17 UTC (rev 45162)
@@ -143,7 +143,7 @@
if (maxstacksize <= 1024) return &bvh_api256;
assert(maxstacksize <= 256);
- return 0;
+ return NULL;
}
RayObject *RE_rayobject_qbvh_create(int size)
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp 2012-03-26 08:58:17 UTC (rev 45162)
@@ -179,7 +179,7 @@
if (maxstacksize <= 1024) return &bvh_api256;
assert(maxstacksize <= 256);
- return 0;
+ return NULL;
}
RayObject *RE_rayobject_svbvh_create(int size)
Modified: trunk/blender/source/blender/render/intern/raytrace/reorganize.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/reorganize.h 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/reorganize.h 2012-03-26 08:58:17 UTC (rev 45162)
@@ -144,7 +144,7 @@
{
Node *next = (*prev)->sibling;
remove_useless(*prev, prev);
- if(*prev == 0)
+ if(*prev == NULL)
*prev = next;
else
{
@@ -158,8 +158,10 @@
if(RE_rayobject_isAligned(node->child) && node->child->sibling == 0)
*new_node = node->child;
}
- else if(node->child == 0)
- *new_node = 0;
+ else if(node->child == NULL)
+ {
+ *new_node = NULL;
+ }
}
/*
Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2012-03-26 08:58:17 UTC (rev 45162)
@@ -296,7 +296,7 @@
{
const static float def_bb[6] = { FLT_MAX, FLT_MAX, FLT_MAX, FLT_MIN, FLT_MIN, FLT_MIN };
alloc_childs--;
- node->child[alloc_childs] = 0;
+ node->child[alloc_childs] = NULL;
copy_bb(node->child_bb+alloc_childs*6, def_bb);
}
Modified: trunk/blender/source/blender/render/intern/raytrace/vbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/vbvh.h 2012-03-26 08:10:12 UTC (rev 45161)
+++ trunk/blender/source/blender/render/intern/raytrace/vbvh.h 2012-03-26 08:58:17 UTC (rev 45162)
@@ -194,7 +194,7 @@
child = &((*child)->sibling);
}
- *child = 0;
+ *child = NULL;
return node;
}
}
More information about the Bf-blender-cvs
mailing list