Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-03-05 01:09:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-03-05 01:12:07 +0300
commitacebfbb6669b4f0c546068777c7f11146aad3def (patch)
treeb20db009b21a703a4daa5400dbc72e8196e59a78 /source/blender/render
parent55137629462d3ca2fb152b56cfe26507bdd2c352 (diff)
Cleanup: unnecessary comma use
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/raytrace/rayobject_rtbuild.cpp3
-rw-r--r--source/blender/render/intern/source/render_texture.c4
-rw-r--r--source/blender/render/intern/source/volumetric.c4
-rw-r--r--source/blender/render/intern/source/zbuf.c4
4 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
index 1d67a8c4f44..00c1129fa85 100644
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
@@ -331,7 +331,8 @@ int rtbuild_heuristic_object_split(RTBuilder *b, int nchilds)
if (size > nchilds) {
float bcost = FLT_MAX;
- baxis = -1, boffset = size / 2;
+ baxis = -1;
+ boffset = size / 2;
SweepCost *sweep = (SweepCost *)MEM_mallocN(sizeof(SweepCost) * size, "RTBuilder.HeuristicSweep");
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 193f619c09c..807686ab65c 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -3827,7 +3827,9 @@ void RE_sample_material_color(
return;
}
- v1=mloop[mlooptri[tri_index].tri[0]].v, v2=mloop[mlooptri[tri_index].tri[1]].v, v3=mloop[mlooptri[tri_index].tri[2]].v;
+ v1 = mloop[mlooptri[tri_index].tri[0]].v;
+ v2 = mloop[mlooptri[tri_index].tri[1]].v;
+ v3 = mloop[mlooptri[tri_index].tri[2]].v;
normal_tri_v3(normal, mvert[v1].co, mvert[v2].co, mvert[v3].co);
/* generate shadeinput with data required */
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 2c0917243a3..610e86caa13 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -269,7 +269,9 @@ static float metadensity(Object *ob, const float co[3])
/* MB_BALL default */
switch (ml->type) {
case MB_ELIPSOID:
- tp[0] /= ml->expx, tp[1] /= ml->expy, tp[2] /= ml->expz;
+ tp[0] /= ml->expx;
+ tp[1] /= ml->expy;
+ tp[2] /= ml->expz;
break;
case MB_CUBE:
tp[2] = (tp[2] > ml->expz) ? (tp[2] - ml->expz) : ((tp[2] < -ml->expz) ? (tp[2] + ml->expz) : 0.f);
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 5fee6d2efb1..d3a1dcfd8ce 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -3250,7 +3250,9 @@ static void copyto_abufz(RenderPart *pa, int *arectz, int *rectmask, int sample)
}
}
- rd++; rza++, rma++;
+ rza++;
+ rma++;
+ rd++;
}
}
}