[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41680] trunk/blender: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Tue Nov 8 21:06:16 CET 2011
Revision: 41680
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41680
Author: gsrb3d
Date: 2011-11-08 20:06:14 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
trunk/blender/intern/cycles/bvh/bvh_sort.cpp
trunk/blender/intern/cycles/bvh/bvh_sort.h
trunk/blender/intern/cycles/kernel/kernel_qbvh.h
trunk/blender/intern/cycles/render/film_response.cpp
Property Changed:
----------------
trunk/blender/build_files/cmake/Modules/FindOpenImageIO.cmake
trunk/blender/intern/cycles/CMakeLists.txt
trunk/blender/intern/cycles/app/CMakeLists.txt
trunk/blender/intern/cycles/app/cycles_server.cpp
trunk/blender/intern/cycles/app/cycles_test.cpp
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/app/cycles_xml.h
trunk/blender/intern/cycles/blender/CMakeLists.txt
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/engine.py
trunk/blender/intern/cycles/blender/addon/enums.py
trunk/blender/intern/cycles/blender/addon/presets.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/addon/xml.py
trunk/blender/intern/cycles/blender/blender_camera.cpp
trunk/blender/intern/cycles/blender/blender_mesh.cpp
trunk/blender/intern/cycles/blender/blender_object.cpp
trunk/blender/intern/cycles/blender/blender_python.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_session.h
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_sync.h
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/intern/cycles/bvh/CMakeLists.txt
trunk/blender/intern/cycles/bvh/bvh.cpp
trunk/blender/intern/cycles/bvh/bvh.h
trunk/blender/intern/cycles/bvh/bvh_build.cpp
trunk/blender/intern/cycles/bvh/bvh_build.h
trunk/blender/intern/cycles/bvh/bvh_node.cpp
trunk/blender/intern/cycles/bvh/bvh_node.h
trunk/blender/intern/cycles/bvh/bvh_params.h
trunk/blender/intern/cycles/bvh/bvh_sort.cpp
trunk/blender/intern/cycles/bvh/bvh_sort.h
trunk/blender/intern/cycles/cmake/external_libs.cmake
trunk/blender/intern/cycles/device/CMakeLists.txt
trunk/blender/intern/cycles/device/device.cpp
trunk/blender/intern/cycles/device/device.h
trunk/blender/intern/cycles/device/device_cpu.cpp
trunk/blender/intern/cycles/device/device_cuda.cpp
trunk/blender/intern/cycles/device/device_intern.h
trunk/blender/intern/cycles/device/device_memory.h
trunk/blender/intern/cycles/device/device_multi.cpp
trunk/blender/intern/cycles/device/device_network.cpp
trunk/blender/intern/cycles/device/device_network.h
trunk/blender/intern/cycles/device/device_opencl.cpp
trunk/blender/intern/cycles/doc/CMakeLists.txt
trunk/blender/intern/cycles/doc/license/Apache_2.0.txt
trunk/blender/intern/cycles/doc/license/Blender.txt
trunk/blender/intern/cycles/doc/license/Boost.txt
trunk/blender/intern/cycles/doc/license/CMakeLists.txt
trunk/blender/intern/cycles/doc/license/GPL.txt
trunk/blender/intern/cycles/doc/license/ILM.txt
trunk/blender/intern/cycles/doc/license/NVidia.txt
trunk/blender/intern/cycles/doc/license/OSL.txt
trunk/blender/intern/cycles/doc/license/Sobol.txt
trunk/blender/intern/cycles/doc/license/readme.txt
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/kernel.cpp
trunk/blender/intern/cycles/kernel/kernel.h
trunk/blender/intern/cycles/kernel/kernel_bvh.h
trunk/blender/intern/cycles/kernel/kernel_camera.h
trunk/blender/intern/cycles/kernel/kernel_compat_cpu.h
trunk/blender/intern/cycles/kernel/kernel_compat_cuda.h
trunk/blender/intern/cycles/kernel/kernel_compat_opencl.h
trunk/blender/intern/cycles/kernel/kernel_differential.h
trunk/blender/intern/cycles/kernel/kernel_displace.h
trunk/blender/intern/cycles/kernel/kernel_emission.h
trunk/blender/intern/cycles/kernel/kernel_film.h
trunk/blender/intern/cycles/kernel/kernel_globals.h
trunk/blender/intern/cycles/kernel/kernel_light.h
trunk/blender/intern/cycles/kernel/kernel_math.h
trunk/blender/intern/cycles/kernel/kernel_mbvh.h
trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
trunk/blender/intern/cycles/kernel/kernel_object.h
trunk/blender/intern/cycles/kernel/kernel_path.h
trunk/blender/intern/cycles/kernel/kernel_qbvh.h
trunk/blender/intern/cycles/kernel/kernel_random.h
trunk/blender/intern/cycles/kernel/kernel_shader.h
trunk/blender/intern/cycles/kernel/kernel_textures.h
trunk/blender/intern/cycles/kernel/kernel_triangle.h
trunk/blender/intern/cycles/kernel/kernel_types.h
trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/background.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_microfacet.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_reflection.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_refraction.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_transparent.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_ward.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_westin.cpp
trunk/blender/intern/cycles/kernel/osl/bssrdf.cpp
trunk/blender/intern/cycles/kernel/osl/debug.cpp
trunk/blender/intern/cycles/kernel/osl/emissive.cpp
trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/nodes/node_color.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
trunk/blender/intern/cycles/kernel/osl/nodes/stdosl.h
trunk/blender/intern/cycles/kernel/osl/osl_closures.cpp
trunk/blender/intern/cycles/kernel/osl/osl_closures.h
trunk/blender/intern/cycles/kernel/osl/osl_globals.h
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/intern/cycles/kernel/osl/osl_services.h
trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
trunk/blender/intern/cycles/kernel/osl/osl_shader.h
trunk/blender/intern/cycles/kernel/osl/vol_subsurface.cpp
trunk/blender/intern/cycles/kernel/svm/bsdf.h
trunk/blender/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
trunk/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
trunk/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
trunk/blender/intern/cycles/kernel/svm/bsdf_reflection.h
trunk/blender/intern/cycles/kernel/svm/bsdf_refraction.h
trunk/blender/intern/cycles/kernel/svm/bsdf_transparent.h
trunk/blender/intern/cycles/kernel/svm/bsdf_ward.h
trunk/blender/intern/cycles/kernel/svm/bsdf_westin.h
trunk/blender/intern/cycles/kernel/svm/emissive.h
trunk/blender/intern/cycles/kernel/svm/svm.h
trunk/blender/intern/cycles/kernel/svm/svm_attribute.h
trunk/blender/intern/cycles/kernel/svm/svm_bsdf.h
trunk/blender/intern/cycles/kernel/svm/svm_closure.h
trunk/blender/intern/cycles/kernel/svm/svm_convert.h
trunk/blender/intern/cycles/kernel/svm/svm_displace.h
trunk/blender/intern/cycles/kernel/svm/svm_fresnel.h
trunk/blender/intern/cycles/kernel/svm/svm_geometry.h
trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
trunk/blender/intern/cycles/kernel/svm/svm_image.h
trunk/blender/intern/cycles/kernel/svm/svm_light_path.h
trunk/blender/intern/cycles/kernel/svm/svm_magic.h
trunk/blender/intern/cycles/kernel/svm/svm_mapping.h
trunk/blender/intern/cycles/kernel/svm/svm_math.h
trunk/blender/intern/cycles/kernel/svm/svm_mix.h
trunk/blender/intern/cycles/kernel/svm/svm_musgrave.h
trunk/blender/intern/cycles/kernel/svm/svm_noise.h
trunk/blender/intern/cycles/kernel/svm/svm_noisetex.h
trunk/blender/intern/cycles/kernel/svm/svm_sky.h
trunk/blender/intern/cycles/kernel/svm/svm_tex_coord.h
trunk/blender/intern/cycles/kernel/svm/svm_texture.h
trunk/blender/intern/cycles/kernel/svm/svm_types.h
trunk/blender/intern/cycles/kernel/svm/svm_value.h
trunk/blender/intern/cycles/kernel/svm/svm_voronoi.h
trunk/blender/intern/cycles/kernel/svm/svm_wave.h
trunk/blender/intern/cycles/kernel/svm/volume.h
trunk/blender/intern/cycles/render/CMakeLists.txt
trunk/blender/intern/cycles/render/attribute.cpp
trunk/blender/intern/cycles/render/attribute.h
trunk/blender/intern/cycles/render/background.cpp
trunk/blender/intern/cycles/render/background.h
trunk/blender/intern/cycles/render/buffers.cpp
trunk/blender/intern/cycles/render/buffers.h
trunk/blender/intern/cycles/render/camera.cpp
trunk/blender/intern/cycles/render/camera.h
trunk/blender/intern/cycles/render/film.cpp
trunk/blender/intern/cycles/render/film.h
trunk/blender/intern/cycles/render/film_response.cpp
trunk/blender/intern/cycles/render/film_response.h
trunk/blender/intern/cycles/render/filter.cpp
trunk/blender/intern/cycles/render/filter.h
trunk/blender/intern/cycles/render/graph.cpp
trunk/blender/intern/cycles/render/graph.h
trunk/blender/intern/cycles/render/image.cpp
trunk/blender/intern/cycles/render/image.h
trunk/blender/intern/cycles/render/integrator.cpp
trunk/blender/intern/cycles/render/integrator.h
trunk/blender/intern/cycles/render/light.cpp
trunk/blender/intern/cycles/render/light.h
trunk/blender/intern/cycles/render/mesh.cpp
trunk/blender/intern/cycles/render/mesh.h
trunk/blender/intern/cycles/render/mesh_displace.cpp
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/intern/cycles/render/object.cpp
trunk/blender/intern/cycles/render/object.h
trunk/blender/intern/cycles/render/osl.cpp
trunk/blender/intern/cycles/render/osl.h
trunk/blender/intern/cycles/render/scene.cpp
trunk/blender/intern/cycles/render/scene.h
trunk/blender/intern/cycles/render/session.cpp
trunk/blender/intern/cycles/render/session.h
trunk/blender/intern/cycles/render/shader.cpp
trunk/blender/intern/cycles/render/shader.h
trunk/blender/intern/cycles/render/sobol.cpp
trunk/blender/intern/cycles/render/sobol.h
trunk/blender/intern/cycles/render/svm.cpp
trunk/blender/intern/cycles/render/svm.h
trunk/blender/intern/cycles/render/tile.cpp
trunk/blender/intern/cycles/render/tile.h
trunk/blender/intern/cycles/subd/CMakeLists.txt
trunk/blender/intern/cycles/subd/subd_build.cpp
trunk/blender/intern/cycles/subd/subd_build.h
trunk/blender/intern/cycles/subd/subd_dice.cpp
trunk/blender/intern/cycles/subd/subd_dice.h
trunk/blender/intern/cycles/subd/subd_edge.h
trunk/blender/intern/cycles/subd/subd_face.h
trunk/blender/intern/cycles/subd/subd_mesh.cpp
trunk/blender/intern/cycles/subd/subd_mesh.h
trunk/blender/intern/cycles/subd/subd_patch.cpp
trunk/blender/intern/cycles/subd/subd_patch.h
trunk/blender/intern/cycles/subd/subd_ring.cpp
trunk/blender/intern/cycles/subd/subd_ring.h
trunk/blender/intern/cycles/subd/subd_split.cpp
trunk/blender/intern/cycles/subd/subd_split.h
trunk/blender/intern/cycles/subd/subd_stencil.cpp
trunk/blender/intern/cycles/subd/subd_stencil.h
trunk/blender/intern/cycles/subd/subd_vert.h
trunk/blender/intern/cycles/util/CMakeLists.txt
trunk/blender/intern/cycles/util/util_algorithm.h
trunk/blender/intern/cycles/util/util_args.h
trunk/blender/intern/cycles/util/util_boundbox.h
trunk/blender/intern/cycles/util/util_cache.cpp
trunk/blender/intern/cycles/util/util_cache.h
trunk/blender/intern/cycles/util/util_color.h
trunk/blender/intern/cycles/util/util_cuda.cpp
trunk/blender/intern/cycles/util/util_cuda.h
trunk/blender/intern/cycles/util/util_debug.h
trunk/blender/intern/cycles/util/util_dynlib.cpp
trunk/blender/intern/cycles/util/util_dynlib.h
trunk/blender/intern/cycles/util/util_foreach.h
trunk/blender/intern/cycles/util/util_function.h
trunk/blender/intern/cycles/util/util_hash.h
trunk/blender/intern/cycles/util/util_image.h
trunk/blender/intern/cycles/util/util_list.h
trunk/blender/intern/cycles/util/util_map.h
trunk/blender/intern/cycles/util/util_math.h
trunk/blender/intern/cycles/util/util_md5.cpp
trunk/blender/intern/cycles/util/util_md5.h
trunk/blender/intern/cycles/util/util_memarena.cpp
trunk/blender/intern/cycles/util/util_memarena.h
trunk/blender/intern/cycles/util/util_opencl.c
trunk/blender/intern/cycles/util/util_opencl.h
trunk/blender/intern/cycles/util/util_opengl.h
trunk/blender/intern/cycles/util/util_param.h
trunk/blender/intern/cycles/util/util_path.cpp
trunk/blender/intern/cycles/util/util_path.h
trunk/blender/intern/cycles/util/util_progress.h
trunk/blender/intern/cycles/util/util_set.h
trunk/blender/intern/cycles/util/util_string.cpp
trunk/blender/intern/cycles/util/util_string.h
trunk/blender/intern/cycles/util/util_system.cpp
trunk/blender/intern/cycles/util/util_system.h
trunk/blender/intern/cycles/util/util_thread.h
trunk/blender/intern/cycles/util/util_time.cpp
trunk/blender/intern/cycles/util/util_time.h
trunk/blender/intern/cycles/util/util_transform.cpp
trunk/blender/intern/cycles/util/util_transform.h
trunk/blender/intern/cycles/util/util_types.h
trunk/blender/intern/cycles/util/util_vector.h
trunk/blender/intern/cycles/util/util_view.cpp
trunk/blender/intern/cycles/util/util_view.h
trunk/blender/intern/cycles/util/util_xml.h
trunk/blender/release/scripts/presets/cycles/integrator/direct_light.py
trunk/blender/release/scripts/presets/cycles/integrator/full_global_illumination.py
trunk/blender/release/scripts/presets/cycles/integrator/limited_global_illumination.py
Property changes on: trunk/blender/build_files/cmake/Modules/FindOpenImageIO.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/app/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/app/cycles_server.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/app/cycles_test.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/app/cycles_xml.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/app/cycles_xml.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/__init__.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/engine.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/enums.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/presets.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/properties.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/ui.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/addon/xml.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_camera.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_mesh.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_object.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_python.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_session.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_session.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_shader.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_sync.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_sync.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/blender/blender_util.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh_build.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh_build.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh_node.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh_node.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/blender/intern/cycles/bvh/bvh_params.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/bvh/bvh_sort.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh_sort.cpp 2011-11-08 19:08:56 UTC (rev 41679)
+++ trunk/blender/intern/cycles/bvh/bvh_sort.cpp 2011-11-08 20:06:14 UTC (rev 41680)
@@ -1,57 +1,57 @@
-/*
- * Adapted from code copyright 2009-2010 NVIDIA Corporation
- * Modifications Copyright 2011, Blender Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "bvh_build.h"
-#include "bvh_sort.h"
-
-#include "util_algorithm.h"
-#include "util_debug.h"
-
-CCL_NAMESPACE_BEGIN
-
-struct BVHReferenceCompare {
-public:
- int dim;
-
- BVHReferenceCompare(int dim_)
- {
- dim = dim_;
- }
-
- bool operator()(const BVHBuild::Reference& ra, const BVHBuild::Reference& rb)
- {
- float ca = ra.bounds.min[dim] + ra.bounds.max[dim];
- float cb = rb.bounds.min[dim] + rb.bounds.max[dim];
-
- if(ca < cb) return true;
- else if(ca > cb) return false;
- else if(ra.prim_object < rb.prim_object) return true;
- else if(ra.prim_object > rb.prim_object) return false;
- else if(ra.prim_index < rb.prim_index) return true;
- else if(ra.prim_index > rb.prim_index) return false;
-
- return false;
- }
-};
-
-void bvh_reference_sort(int start, int end, BVHBuild::Reference *data, int dim)
-{
- sort(data+start, data+end, BVHReferenceCompare(dim));
-}
-
-CCL_NAMESPACE_END
-
+/*
+ * Adapted from code copyright 2009-2010 NVIDIA Corporation
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bvh_build.h"
+#include "bvh_sort.h"
+
+#include "util_algorithm.h"
+#include "util_debug.h"
+
+CCL_NAMESPACE_BEGIN
+
+struct BVHReferenceCompare {
+public:
+ int dim;
+
+ BVHReferenceCompare(int dim_)
+ {
+ dim = dim_;
+ }
+
+ bool operator()(const BVHBuild::Reference& ra, const BVHBuild::Reference& rb)
+ {
+ float ca = ra.bounds.min[dim] + ra.bounds.max[dim];
+ float cb = rb.bounds.min[dim] + rb.bounds.max[dim];
+
+ if(ca < cb) return true;
+ else if(ca > cb) return false;
+ else if(ra.prim_object < rb.prim_object) return true;
+ else if(ra.prim_object > rb.prim_object) return false;
+ else if(ra.prim_index < rb.prim_index) return true;
+ else if(ra.prim_index > rb.prim_index) return false;
+
+ return false;
+ }
+};
+
+void bvh_reference_sort(int start, int end, BVHBuild::Reference *data, int dim)
+{
+ sort(data+start, data+end, BVHReferenceCompare(dim));
+}
+
+CCL_NAMESPACE_END
+
Property changes on: trunk/blender/intern/cycles/bvh/bvh_sort.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/bvh/bvh_sort.h
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh_sort.h 2011-11-08 19:08:56 UTC (rev 41679)
+++ trunk/blender/intern/cycles/bvh/bvh_sort.h 2011-11-08 20:06:14 UTC (rev 41680)
@@ -1,28 +1,28 @@
- /*
- * Adapted from code copyright 2009-2010 NVIDIA Corporation
- * Modifications Copyright 2011, Blender Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list