diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-28 19:23:16 +0400 |
commit | 0c6a0b293f5e9a1f37a6aea267e4a723731d4225 (patch) | |
tree | 1b69e5c4633e87c93d5e7a4282d490fab0ed740d /source/blender/render | |
parent | d800cffaf10cb73446d4f3739bca968224f3a1dc (diff) |
style cleanup
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index a08edd3fdb7..bae65c492f4 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -375,8 +375,8 @@ int rtbuild_heuristic_object_split(RTBuilder *b, int nchilds) // not using log seems to have no impact on raytracing perf, but // makes tree construction quicker, left out for now to test (brecht) - // left_side = bb_area(sweep_left.bb, sweep_left.bb+3)*(sweep_left.cost+logf((float)i)); - // right_side= bb_area(sweep[i].bb, sweep[i].bb+3)*(sweep[i].cost+logf((float)size-i)); + // left_side = bb_area(sweep_left.bb, sweep_left.bb + 3) * (sweep_left.cost + logf((float)i)); + // right_side = bb_area(sweep[i].bb, sweep[i].bb + 3) * (sweep[i].cost + logf((float)size - i)); left_side = bb_area(sweep_left.bb, sweep_left.bb + 3) * (sweep_left.cost); right_side = bb_area(sweep[i].bb, sweep[i].bb + 3) * (sweep[i].cost); hcost = left_side + right_side; diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index e73c0397c6b..b486407c61c 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -285,7 +285,7 @@ static void init_frame_smoke(VoxelData *vd, float cfra) } /* always store copy, as smoke internal data can change */ - totRes= vd_resol_size(vd); + totRes = vd_resol_size(vd); vd->dataset = MEM_mapallocN(sizeof(float)*(totRes), "smoke data"); memcpy(vd->dataset, flame, sizeof(float)*totRes); } |