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:
Diffstat (limited to 'source/blender/render/intern/raytrace/rayobject_qbvh.cpp')
-rw-r--r--source/blender/render/intern/raytrace/rayobject_qbvh.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
index 2d0abba9a75..bfcfbee536f 100644
--- a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
@@ -78,7 +78,7 @@ void bvh_done<QBVHTree>(QBVHTree *obj)
}
if (root) {
- pushup_simd<VBVHNode,4>(root);
+ pushup_simd<VBVHNode, 4>(root);
obj->root = Reorganize_SVBVH<VBVHNode>(arena2).transform(root);
}
else
@@ -100,9 +100,9 @@ int intersect(QBVHTree *obj, Isect* isec)
//TODO renable hint support
if (RE_rayobject_isAligned(obj->root)) {
if (isec->mode == RE_RAY_SHADOW)
- return svbvh_node_stack_raycast<StackSize,true>(obj->root, isec);
+ return svbvh_node_stack_raycast<StackSize, true>(obj->root, isec);
else
- return svbvh_node_stack_raycast<StackSize,false>(obj->root, isec);
+ return svbvh_node_stack_raycast<StackSize, false>(obj->root, isec);
}
else
return RE_rayobject_intersect((RayObject*)obj->root, isec);
@@ -123,13 +123,13 @@ RayObjectAPI make_api()
{
static RayObjectAPI api =
{
- (RE_rayobject_raycast_callback) ((int(*)(Tree*,Isect*)) &intersect<STACK_SIZE>),
- (RE_rayobject_add_callback) ((void(*)(Tree*,RayObject*)) &bvh_add<Tree>),
+ (RE_rayobject_raycast_callback) ((int(*)(Tree*, Isect*)) &intersect<STACK_SIZE>),
+ (RE_rayobject_add_callback) ((void(*)(Tree*, RayObject*)) &bvh_add<Tree>),
(RE_rayobject_done_callback) ((void(*)(Tree*)) &bvh_done<Tree>),
(RE_rayobject_free_callback) ((void(*)(Tree*)) &bvh_free<Tree>),
- (RE_rayobject_merge_bb_callback)((void(*)(Tree*,float*,float*)) &bvh_bb<Tree>),
+ (RE_rayobject_merge_bb_callback)((void(*)(Tree*, float*, float*)) &bvh_bb<Tree>),
(RE_rayobject_cost_callback) ((float(*)(Tree*)) &bvh_cost<Tree>),
- (RE_rayobject_hint_bb_callback) ((void(*)(Tree*,LCTSHint*,float*,float*)) &bvh_hint_bb<Tree>)
+ (RE_rayobject_hint_bb_callback) ((void(*)(Tree*, LCTSHint*, float*, float*)) &bvh_hint_bb<Tree>)
};
return api;
@@ -138,7 +138,7 @@ RayObjectAPI make_api()
template<class Tree>
RayObjectAPI* bvh_get_api(int maxstacksize)
{
- static RayObjectAPI bvh_api256 = make_api<Tree,1024>();
+ static RayObjectAPI bvh_api256 = make_api<Tree, 1024>();
if (maxstacksize <= 1024) return &bvh_api256;
assert(maxstacksize <= 256);
@@ -147,7 +147,7 @@ RayObjectAPI* bvh_get_api(int maxstacksize)
RayObject *RE_rayobject_qbvh_create(int size)
{
- return bvh_create_tree<QBVHTree,DFS_STACK_SIZE>(size);
+ return bvh_create_tree<QBVHTree, DFS_STACK_SIZE>(size);
}
#else