archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup, brackets in else/if, some indentation.

Browse Source
This commit is contained in:
Campbell Barton
2012-03-06 18:40:15 +00:00
parent 7b7214c722
commit 31d2ee9bf7
116 changed files with 599 additions and 982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/render/intern/source/rayshade.c
View File

@@ -265,14 +265,12 @@ RayObject* makeraytree_object(Render *re, ObjectInstanceRen *obi)
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
if(is_raytraceable_vlr(re, vlr))
{
if( (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) )
{
if ((re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS)) {
RE_rayobject_add( raytree, RE_vlakprimitive_from_vlak( vlakprimitive, obi, vlr ) );
vlakprimitive++;
}
else
{
RE_rayface_from_vlak( face, obi, vlr );
else {
RE_rayface_from_vlak(face, obi, vlr);
RE_rayobject_add( raytree, RE_rayobject_unalignRayFace(face) );
face++;
}
@@ -336,12 +334,10 @@ static void makeraytree_single(Render *re)
ObjectRen *obr = obi->obr;
obs++;
if(has_special_rayobject(re, obi))
{
if (has_special_rayobject(re, obi)) {
special++;
}
else
{
else {
int v;
for(v=0;v<obr->totvlak;v++)
{
@@ -365,8 +361,7 @@ static void makeraytree_single(Render *re)
{
vlakprimitive = re->rayprimitives = (VlakPrimitive*)MEM_callocN(faces*sizeof(VlakPrimitive), "Raytrace vlak-primitives");
}
else
{
else {
face = re->rayfaces = (RayFace*)MEM_callocN(faces*sizeof(RayFace), "Render ray faces");
}
@@ -376,8 +371,7 @@ static void makeraytree_single(Render *re)
if(test_break(re))
break;
if(has_special_rayobject(re, obi))
{
if (has_special_rayobject(re, obi)) {
RayObject *obj = makeraytree_object(re, obi);
if(test_break(re))
@@ -386,8 +380,7 @@ static void makeraytree_single(Render *re)
if (obj)
RE_rayobject_add( re->raytree, obj );
}
else
{
else {
int v;
ObjectRen *obr = obi->obr;
@@ -399,16 +392,13 @@ static void makeraytree_single(Render *re)
for(v=0;v<obr->totvlak;v++)
{
VlakRen *vlr = obr->vlaknodes[v>>8].vlak + (v&255);
if(is_raytraceable_vlr(re, vlr))
{
if( (re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS) )
{
if (is_raytraceable_vlr(re, vlr)) {
if ((re->r.raytrace_options & R_RAYTRACE_USE_LOCAL_COORDS)) {
RayObject *obj = RE_vlakprimitive_from_vlak( vlakprimitive, obi, vlr );
RE_rayobject_add( raytree, obj );
vlakprimitive++;
}
else
{
else {
RE_rayface_from_vlak(face, obi, vlr);
if((obi->flag & R_TRANSFORMED))
{
@@ -451,15 +441,13 @@ void makeraytree(Render *re)
makeraytree_single(re);
if(test_break(re))
{
if (test_break(re)) {
freeraytree(re);
re->i.infostr= "Raytree building canceled";
re->stats_draw(re->sdh, &re->i);
}
else
{
else {
//Calculate raytree max_size
//This is ONLY needed to kept a bogus behavior of SUN and HEMI lights
INIT_MINMAX(min, max);