[Bf-blender-cvs] [8b46b9cdb7e] temp-cycles-source-reorganize: Cycles: remove prefix from source code file names
Brecht Van Lommel
noreply at git.blender.org
Mon Oct 25 21:20:49 CEST 2021
Commit: 8b46b9cdb7ed2f04a94dc9aa36173828e5790b2b
Author: Brecht Van Lommel
Date: Sun Oct 24 14:19:19 2021 +0200
Branches: temp-cycles-source-reorganize
https://developer.blender.org/rB8b46b9cdb7ed2f04a94dc9aa36173828e5790b2b
Cycles: remove prefix from source code file names
Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.
For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.
===================================================================
M intern/cycles/app/cycles_server.cpp
M intern/cycles/app/cycles_standalone.cpp
M intern/cycles/app/cycles_xml.cpp
M intern/cycles/app/oiio_output_driver.h
M intern/cycles/blender/CMakeLists.txt
R099 intern/cycles/blender/blender_camera.cpp intern/cycles/blender/camera.cpp
R099 intern/cycles/blender/blender_curves.cpp intern/cycles/blender/curves.cpp
R096 intern/cycles/blender/blender_device.cpp intern/cycles/blender/device.cpp
R100 intern/cycles/blender/blender_device.h intern/cycles/blender/device.h
R099 intern/cycles/blender/blender_display_driver.cpp intern/cycles/blender/display_driver.cpp
R099 intern/cycles/blender/blender_display_driver.h intern/cycles/blender/display_driver.h
R098 intern/cycles/blender/blender_geometry.cpp intern/cycles/blender/geometry.cpp
R098 intern/cycles/blender/blender_id_map.h intern/cycles/blender/id_map.h
R098 intern/cycles/blender/blender_image.cpp intern/cycles/blender/image.cpp
R100 intern/cycles/blender/blender_image.h intern/cycles/blender/image.h
R098 intern/cycles/blender/blender_light.cpp intern/cycles/blender/light.cpp
R096 intern/cycles/blender/blender_logging.cpp intern/cycles/blender/logging.cpp
R099 intern/cycles/blender/blender_mesh.cpp intern/cycles/blender/mesh.cpp
R099 intern/cycles/blender/blender_object.cpp intern/cycles/blender/object.cpp
R098 intern/cycles/blender/blender_object_cull.cpp intern/cycles/blender/object_cull.cpp
R095 intern/cycles/blender/blender_object_cull.h intern/cycles/blender/object_cull.h
R098 intern/cycles/blender/blender_output_driver.cpp intern/cycles/blender/output_driver.cpp
R100 intern/cycles/blender/blender_output_driver.h intern/cycles/blender/output_driver.h
R096 intern/cycles/blender/blender_particles.cpp intern/cycles/blender/particles.cpp
R098 intern/cycles/blender/blender_python.cpp intern/cycles/blender/python.cpp
R098 intern/cycles/blender/blender_session.cpp intern/cycles/blender/session.cpp
R099 intern/cycles/blender/blender_session.h intern/cycles/blender/session.h
R099 intern/cycles/blender/blender_shader.cpp intern/cycles/blender/shader.cpp
R098 intern/cycles/blender/blender_sync.cpp intern/cycles/blender/sync.cpp
R097 intern/cycles/blender/blender_sync.h intern/cycles/blender/sync.h
R097 intern/cycles/blender/blender_texture.cpp intern/cycles/blender/texture.cpp
R096 intern/cycles/blender/blender_texture.h intern/cycles/blender/texture.h
R098 intern/cycles/blender/blender_util.h intern/cycles/blender/util.h
R097 intern/cycles/blender/blender_viewport.cpp intern/cycles/blender/viewport.cpp
R100 intern/cycles/blender/blender_viewport.h intern/cycles/blender/viewport.h
R099 intern/cycles/blender/blender_volume.cpp intern/cycles/blender/volume.cpp
M intern/cycles/bvh/CMakeLists.txt
R098 intern/cycles/bvh/bvh_binning.cpp intern/cycles/bvh/binning.cpp
R097 intern/cycles/bvh/bvh_binning.h intern/cycles/bvh/binning.h
R099 intern/cycles/bvh/bvh_build.cpp intern/cycles/bvh/build.cpp
R096 intern/cycles/bvh/bvh_build.h intern/cycles/bvh/build.h
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh.h
M intern/cycles/bvh/bvh2.cpp
M intern/cycles/bvh/bvh2.h
R098 intern/cycles/bvh/bvh_embree.cpp intern/cycles/bvh/embree.cpp
R093 intern/cycles/bvh/bvh_embree.h intern/cycles/bvh/embree.h
R094 intern/cycles/bvh/bvh_multi.cpp intern/cycles/bvh/multi.cpp
R097 intern/cycles/bvh/bvh_multi.h intern/cycles/bvh/multi.h
R098 intern/cycles/bvh/bvh_node.cpp intern/cycles/bvh/node.cpp
R098 intern/cycles/bvh/bvh_node.h intern/cycles/bvh/node.h
R097 intern/cycles/bvh/bvh_optix.cpp intern/cycles/bvh/optix.cpp
R094 intern/cycles/bvh/bvh_optix.h intern/cycles/bvh/optix.h
R099 intern/cycles/bvh/bvh_params.h intern/cycles/bvh/params.h
R098 intern/cycles/bvh/bvh_sort.cpp intern/cycles/bvh/sort.cpp
R100 intern/cycles/bvh/bvh_sort.h intern/cycles/bvh/sort.h
R099 intern/cycles/bvh/bvh_split.cpp intern/cycles/bvh/split.cpp
R099 intern/cycles/bvh/bvh_split.h intern/cycles/bvh/split.h
R097 intern/cycles/bvh/bvh_unaligned.cpp intern/cycles/bvh/unaligned.cpp
R098 intern/cycles/bvh/bvh_unaligned.h intern/cycles/bvh/unaligned.h
M intern/cycles/device/CMakeLists.txt
M intern/cycles/device/cpu/device.cpp
M intern/cycles/device/cpu/device.h
M intern/cycles/device/cpu/device_impl.cpp
M intern/cycles/device/cpu/device_impl.h
M intern/cycles/device/cpu/kernel.h
M intern/cycles/device/cpu/kernel_function.h
M intern/cycles/device/cpu/kernel_thread_globals.cpp
M intern/cycles/device/cuda/device.cpp
M intern/cycles/device/cuda/device.h
M intern/cycles/device/cuda/device_impl.cpp
M intern/cycles/device/cuda/device_impl.h
M intern/cycles/device/cuda/graphics_interop.h
M intern/cycles/device/cuda/kernel.h
M intern/cycles/device/cuda/queue.h
R098 intern/cycles/device/device_denoise.cpp intern/cycles/device/denoise.cpp
R099 intern/cycles/device/device_denoise.h intern/cycles/device/denoise.h
M intern/cycles/device/device.cpp
M intern/cycles/device/device.h
M intern/cycles/device/dummy/device.cpp
M intern/cycles/device/dummy/device.h
R093 intern/cycles/device/device_graphics_interop.cpp intern/cycles/device/graphics_interop.cpp
R097 intern/cycles/device/device_graphics_interop.h intern/cycles/device/graphics_interop.h
M intern/cycles/device/hip/device.cpp
M intern/cycles/device/hip/device.h
M intern/cycles/device/hip/device_impl.cpp
M intern/cycles/device/hip/device_impl.h
M intern/cycles/device/hip/graphics_interop.h
M intern/cycles/device/hip/kernel.h
M intern/cycles/device/hip/queue.h
R098 intern/cycles/device/device_kernel.cpp intern/cycles/device/kernel.cpp
R093 intern/cycles/device/device_kernel.h intern/cycles/device/kernel.h
R099 intern/cycles/device/device_memory.cpp intern/cycles/device/memory.cpp
R098 intern/cycles/device/device_memory.h intern/cycles/device/memory.h
M intern/cycles/device/multi/device.cpp
M intern/cycles/device/multi/device.h
M intern/cycles/device/optix/device.cpp
M intern/cycles/device/optix/device.h
M intern/cycles/device/optix/device_impl.cpp
M intern/cycles/device/optix/device_impl.h
M intern/cycles/device/optix/queue.cpp
R095 intern/cycles/device/device_queue.cpp intern/cycles/device/queue.cpp
R095 intern/cycles/device/device_queue.h intern/cycles/device/queue.h
M intern/cycles/graph/node.cpp
M intern/cycles/graph/node.h
M intern/cycles/graph/node_enum.h
M intern/cycles/graph/node_type.cpp
M intern/cycles/graph/node_type.h
M intern/cycles/graph/node_xml.cpp
M intern/cycles/graph/node_xml.h
M intern/cycles/integrator/adaptive_sampling.cpp
M intern/cycles/integrator/denoiser.cpp
M intern/cycles/integrator/denoiser.h
M intern/cycles/integrator/denoiser_device.cpp
M intern/cycles/integrator/denoiser_device.h
M intern/cycles/integrator/denoiser_oidn.cpp
M intern/cycles/integrator/denoiser_oidn.h
M intern/cycles/integrator/denoiser_optix.cpp
M intern/cycles/integrator/pass_accessor.cpp
M intern/cycles/integrator/pass_accessor.h
M intern/cycles/integrator/pass_accessor_cpu.cpp
M intern/cycles/integrator/pass_accessor_gpu.cpp
M intern/cycles/integrator/pass_accessor_gpu.h
M intern/cycles/integrator/path_trace.cpp
M intern/cycles/integrator/path_trace.h
M intern/cycles/integrator/path_trace_display.cpp
M intern/cycles/integrator/path_trace_display.h
M intern/cycles/integrator/path_trace_work.cpp
M intern/cycles/integrator/path_trace_work.h
M intern/cycles/integrator/path_trace_work_cpu.cpp
M intern/cycles/integrator/path_trace_work_cpu.h
M intern/cycles/integrator/path_trace_work_gpu.cpp
M intern/cycles/integrator/path_trace_work_gpu.h
M intern/cycles/integrator/render_scheduler.cpp
M intern/cycles/integrator/render_scheduler.h
M intern/cycles/integrator/shader_eval.cpp
M intern/cycles/integrator/shader_eval.h
M intern/cycles/integrator/tile.cpp
M intern/cycles/integrator/tile.h
M intern/cycles/integrator/work_balancer.cpp
M intern/cycles/integrator/work_balancer.h
M intern/cycles/integrator/work_tile_scheduler.cpp
M intern/cycles/integrator/work_tile_scheduler.h
M intern/cycles/kernel/CMakeLists.txt
M intern/cycles/kernel/bake/bake.h
M intern/cycles/kernel/bvh/bvh.h
R099 intern/cycles/kernel/bvh/bvh_embree.h intern/cycles/kernel/bvh/embree.h
R100 intern/cycles/kernel/bvh/bvh_local.h intern/cycles/kernel/bvh/local.h
R100 intern/cycles/kernel/bvh/bvh_nodes.h intern/cycles/kernel/bvh/nodes.h
R100 intern/cycles/kernel/bvh/bvh_shadow_all.h intern/cycles/kernel/bvh/shadow_all.h
R100 intern/cycles/kernel/bvh/bvh_traversal.h intern/cycles/kernel/bvh/traversal.h
R100 intern/cycles/kernel/bvh/bvh_types.h intern/cycles/kernel/bvh/types.h
R100 intern/cycles/kernel/bvh/bvh_util.h intern/cycles/kernel/bvh/util.h
R100 intern/cycles/kernel/bvh/bvh_volume.h intern/cycles/kernel/bvh/volume.h
R100 intern/cycles/kernel/bvh/bvh_volume_all.h intern/cycles/kernel/bvh/volume_all.h
M intern/cycles/kernel/camera/camera.h
R100 intern/cycles/kernel/camera/camera_projection.h intern/cycles/kernel/camera/projection.h
M intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
M intern/cycles/kernel/closure/bsdf_diffuse.h
M intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
M intern/cycles/kernel/closure/bsdf_hair_principled.h
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M intern/cycles/kernel/closure/bsdf_principled_diffuse.h
M intern/cycles/kernel/device/cpu/compat.h
M intern/cycles/kernel/device/cpu/globals.h
M intern/cycles/kernel/device/cpu/kernel.cpp
M intern/cycles/kernel/device/cpu/kernel.h
M intern/cycles/kernel/device/cpu/kernel_arch_impl.h
M intern/cycles/kernel/device/cpu/kernel_avx.cpp
M intern/cycles/kernel/device/cpu/kernel_avx2.cpp
M intern/cycles/kernel/device/cpu/kernel_sse2.cpp
M intern/cycles/kernel/device/cpu/kernel_sse3.cpp
M intern/cycles/kernel/device/cpu/kernel_sse41.cpp
M intern/cycles/kernel/device/cuda/compat.h
M intern/cycles/kernel/device/cuda/globals.h
M intern/cycles/kernel/device/gpu/kernel.h
M intern/cycles/kernel/device/gpu/parallel_active_index.h
M intern/cycles/kernel/device/gpu/parallel_prefix_sum.h
M intern/cycles/kernel/device/gpu/parallel_sorted_index.h
M intern/cycles/kernel/device/hip/compat.h
M intern/cycles/kernel/device/hip/globals.h
M intern/cycles/kernel/device/optix/compat.h
M intern/cycles/kernel/device/optix/globals.h
M intern/cycles/kernel/device/optix/kernel.cu
M intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
R099 intern/cycles/kernel/film/film_accumulate.h intern/cycles/kernel/film/accumulate.h
R099 intern/cycles/kernel/film/film_adaptive_sampling.h intern/cycles/kernel/film/adaptive_sampling.h
R100 intern/cycles/kernel/film/film_id_passes.h intern/cycles/kernel/film/id_passes.h
R099 intern/cycles/kernel/film/film_passes.h intern/cycles/kernel/film/passes.h
R100 intern/cycles/kernel/film/film_read.h intern/cycles/kernel/film/read.h
R100 intern/cycles/kernel/film/film_write_passes.h intern/cycles/kernel/film/write_passes.h
R100 intern/cycles/kernel/geom/geom_attribute.h intern/cycles/kernel/geom/attribute.h
R100 intern/cycles/kernel/geom/geom_curve.h intern/cycles/kernel/geom/curve.h
R100 intern/cycles/kernel/geom/geom_curve_intersect.h intern/cycles/kernel/geom/curve_intersect.h
M intern/cycles/kernel/geom/geom.h
R100 intern/cycles/kernel/geom/geom_motion_curve.h intern/cycles/kernel/geom/motion_curve.h
R099 intern/cycles/kernel/geom/geom_motion_triangle.h intern/cycles/kernel/geom/motion_triangle.h
R100 intern/cycles/kernel/geom/geom_motion_triangle_intersect.h intern/cycles/kernel/geom/motion_triangle_intersect.h
R100 intern/cycles/kernel/geom/geom_motion_triangle_shader.h intern/cycles/kernel/geom/motion_triangle_shader.h
R100 intern/cycles/kernel/geom/geom_object.h intern/cycles/kernel/geom/object.h
R099 intern/cycles/kernel/geom/geom_patch.h intern/cycles/kernel/geom/patch.h
R099 intern/cycles/kernel/geom/geom_primitive.h intern/cycles/kernel/geom/primitive.h
R100 intern/cycles/kernel/geom/geom_shader_data.h intern/cycles/kernel/geom/shader_data.h
R100 intern/cycles/kernel/geom/geom_subd_triangle.h intern/cycles/kernel/geom/subd_triangle.h
R100 intern/cycles/kernel/geom/geom_triangle.h intern/cycles/kernel/geom/triangle.h
R099 intern/cycles/kernel/geom/geom_triangle_intersect.h intern/cycles/kernel/geom/triangle_intersect.h
R100 intern/cycles/kernel/geom/geom_volume.h intern/cycles/kernel/geom/volume.h
R097 intern/cycles/kernel/integrator/integrator_init_from_bake.h intern/cycles/kernel/integrator/init_from_bake.h
R094 intern/cycles/kernel/integrator/integrator_init_from_camera.h intern/cycles/kernel/integrator/init_from_camera.h
R097 intern/cycles/kernel/integrator/integrator_intersect_closest.h intern/cycles/kernel/integrator/intersect_closest.h
R100 intern/cycles/kernel/integrator/integrator_intersect_shadow.h intern/cycles/kernel/integrator/intersect_shadow.h
R094 intern/cycles/kernel/integrator/integrator_intersect_subsurface.h intern/cycles/kernel/integrator/intersect_subsurface.h
R098 intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h intern/cycles/kernel/integrator/intersect_volume_stack.h
R085 intern/cycles/kernel/integrator/integrator_megakernel.h intern/cycles/kernel/integrator/megakernel.h
R099 intern/cycles/kernel/integrator/integrator_path_state.h intern/cycles/kernel/integrator/path_state.h
R098 intern/cycles/kernel/integrator/integrator_shade_background.h intern/cycles/kernel/integrator/shade_background.h
R097 intern/cycles/kernel/integrator/integrator_shade_light.h intern/cycles/kernel/integrator/shade_light.h
R097 intern/cycles/kernel/integrator/integrator_shade_shadow.h intern/cycles/kernel/integrator/shade_shadow.h
R098 intern/cycles/kernel/integrator/integrator_shade_surface.h intern/cycles/kernel/integrator/shade_surface.h
R099 intern/cycles/kernel/integrator/integrator_shade_volume.h intern/cycles/kernel/integrator/shade_volume.h
R099 intern/cycles/kernel/integrator/integrator_shader_eval.h intern/cycles/kernel/integrator/shader_eval.h
R097 intern/cycles/kernel/integrator/integrator_shadow_catcher.h intern/cycles/kernel/integrator/shadow_catcher.h
R100 intern/cycles/kernel/integrator/integrator_shadow_state_template.h intern/cycles/kernel/integrator/shadow_state_template.h
R095 intern/cycles/kernel/integrator/integrator_state.h intern/cycles/kernel/integrator/state.h
R099 intern/cycles/kernel/integrator/integrator_state_flow.h intern/cycles/kernel/integrator/state_flow.h
R100 intern/cycles/kernel/integrator/integrator_state_template.h intern/cycles/kernel/integrator/state_template.h
R098 intern/cycles/kernel/integrator/integrator_state_util.h intern/cycles/kernel/integrator/state_util.h
R095 intern/cycles/kernel/integrator/integrator_subsurface.h intern/cycles/kernel/integrator/subsurface.h
R100 intern/cycles/kernel/integrator/integrator_subsurface_disk.h intern/cycles/kernel/integrator/subsurface_disk.h
R099 intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h intern/cycles/kernel/integrator/subsurface_random_walk.h
R100 intern/cycles/kernel/integrator/integrator_volume_stack.h intern/cycles/kernel/integrator/volume_stack.h
R099 intern/cycles/kernel/light/light_background.h intern/cycles/kernel/light/background.h
R099 intern/cycles/kernel/light/light_common.h intern/cycles/kernel/light/common.h
M intern/cycles/kernel/light/light.h
R098 intern/cycles/kernel/light/light_sample.h intern/cycles/kernel/light/sample.h
M intern/cycles/kernel/osl/CMakeLists.txt
M intern/cycles/kernel/osl/background.cpp
M intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
M intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
R098 intern/cycles/kernel/osl/osl_bssrdf.cpp intern/cycles/kernel/osl/bssrdf.cpp
R099 intern/cycles/kernel/osl/osl_closures.cpp intern/cycles/kernel/osl/closures.cpp
R099 intern/cycles/kernel/osl/osl_closures.h intern/cycles/kernel/osl/closures.h
M intern/cycles/kernel/osl/emissive.cpp
R093 intern/cycles/kernel/osl/osl_globals.h intern/cycles/kernel/osl/globals.h
R098 intern/cycles/kernel/osl/osl_services.cpp intern/cycles/kernel/osl/services.cpp
R100 intern/cycles/kernel/osl/osl_services.h intern/cycles/kernel/osl/services.h
R098 intern/cycles/kernel/osl/osl_shader.cpp intern/cycles/kernel/osl/shader.cpp
R098 intern/cycles/kernel/osl/osl_shader.h intern/cycles/kernel/osl/shader.h
R100 intern/cycles/kernel/sample/sample_jitter.h intern/cycles/kernel/sample/jitter.h
A intern/cycles/kernel/sample/lcg.h
R100 intern/cycles/kernel/sample/sample_mapping.h intern/cycles/kernel/sample/mapping.h
A intern/cycles/kernel/sample/mis.h
R098 intern/cycles/kernel/sample/sample_pattern.h intern/cycles/kernel/sample/pattern.h
R099 intern/cycles/kernel/svm/svm_ao.h intern/cycles/kernel/svm/ao.h
R098 intern/cycles/kernel/svm/svm_aov.h intern/cycles/kernel/svm/aov.h
R099 intern/cycles/kernel/svm/svm_attribute.h intern/cycles/kernel/svm/attribute.h
R099 intern/cycles/kernel/svm/svm_bevel.h intern/cycles/kernel/svm/bevel.h
R097 intern/cycles/kernel/svm/svm_blackbody.h intern/cycles/kernel/svm/blackbody.h
R099 intern/cycles/kernel/svm/svm_brick.h intern/cycles/kernel/svm/brick.h
R096 intern/cycles/kernel/svm/svm_brightness.h intern/cycles/kernel/svm/brightness.h
R099 intern/cycles/kernel/svm/svm_bump.h intern/cycles/kernel/svm/bump.h
R099 intern/cycles/kernel/svm/svm_camera.h intern/cycles/kernel/svm/camera.h
R099 intern/cycles/kernel/svm/svm_checker.h intern/cycles/kernel/svm/checker.h
R099 intern/cycles/kernel/svm/svm_clamp.h intern/cycles/kernel/svm/clamp.h
R099 intern/cycles/kernel/svm/svm_closure.h intern/cycles/kernel/svm/closure.h
R099 intern/cycles/kernel/svm/svm_color_util.h intern/cycles/kernel/svm/color_util.h
R099 intern/cycles/kernel/svm/svm_convert.h intern/cycles/kernel/svm/convert.h
R099 intern/cycles/kernel/svm/svm_displace.h intern/cycles/kernel/svm/displace.h
R098 intern/cycles/kernel/svm/svm_fractal_noise.h intern/cycles/kernel/svm/fractal_noise.h
R099 intern/cycles/kernel/svm/svm_fresnel.h intern/cycles/kernel/svm/fresnel.h
R098 intern/cycles/kernel/svm/svm_gamma.h intern/cycles/kernel/svm/gamma.h
R099 intern/cycles/kernel/svm/svm_geometry.h intern/cycles/kernel/svm/geometry.h
R099 intern/cycles/kernel/svm/svm_gradient.h intern/cycles/kernel/svm/gradient.h
R096 intern/cycles/kernel/svm/svm_hsv.h intern/cycles/kernel/svm/hsv.h
R099 intern/cycles/kernel/svm/svm_ies.h intern/cycles/kernel/svm/ies.h
R099 intern/cycles/kernel/svm/svm_image.h intern/cycles/kernel/svm/image.h
R098 intern/cycles/kernel/svm/svm_invert.h intern/cycles/kernel/svm/invert.h
R099 intern/cycles/kernel/svm/svm_light_path.h intern/cycles/kernel/svm/light_path.h
R099 intern/cycles/kernel/svm/svm_magic.h intern/cycles/kernel/svm/magic.h
R099 intern/cycles/kernel/svm/svm_map_range.h intern/cycles/kernel/svm/map_range.h
R098 intern/cycles/kernel/svm/svm_mapping.h intern/cycles/kernel/svm/mapping.h
R099 intern/cycles/kernel/svm/svm_mapping_util.h intern/cycles/kernel/svm/mapping_util.h
R099 intern/cycles/kernel/svm/svm_math.h intern/cycles/kernel/svm/math.h
R099 intern/cycles/kernel/svm/svm_math_util.h intern/cycles/kernel/svm/math_util.h
R099 intern/cycles/kernel/svm/svm_mix.h intern/cycles/kernel/svm/mix.h
R099 intern/cycles/kernel/svm/svm_musgrave.h intern/cycles/kernel/svm/musgrave.h
R099 intern/cycles/kernel/svm/svm_noise.h intern/cycles/kernel/svm/noise.h
R099 intern/cycles/kernel/svm/svm_noisetex.h intern/cycles/kernel/svm/noisetex.h
R099 intern/cycles/kernel/svm/svm_normal.h intern/cycles/kernel/svm/normal.h
R098 intern/cycles/kernel/svm/svm_ramp.h intern/cycles/kernel/svm/ramp.h
R096 intern/cycles/kernel/svm/svm_ramp_util.h intern/cycles/kernel/svm/ramp_util.h
R099 intern/cycles/kernel/svm/svm_sepcomb_hsv.h intern/cycles/kernel/svm/sepcomb_hsv.h
R099 intern/cycles/kernel/svm/svm_sepcomb_vector.h intern/cycles/kernel/svm/sepcomb_vector.h
R099 intern/cycles/kernel/svm/svm_sky.h intern/cycles/kernel/svm/sky.h
M intern/cycles/kernel/svm/svm.h
R099 intern/cycles/kernel/svm/svm_tex_coord.h intern/cycles/kernel/svm/tex_coord.h
R099 intern/cycles/kernel/svm/svm_types.h intern/cycles/kernel/svm/types.h
R099 intern/cycles/kernel/svm/svm_value.h intern/cycles/kernel/svm/value.h
R099 intern/cycles/kernel/svm/svm_vector_rotate.h intern/cycles/kernel/svm/vector_rotate.h
R099 intern/cycles/kernel/svm/svm_vector_transform.h intern/cycles/kernel/svm/vector_transform.h
R099 intern/cycles/kernel/svm/svm_vertex_color.h intern/cycles/kernel/svm/vertex_color.h
R099 intern/cycles/kernel/svm/svm_voronoi.h intern/cycles/kernel/svm/voronoi.h
R099 intern/cycles/kernel/svm/svm_voxel.h intern/cycles/kernel/svm/voxel.h
R099 intern/cycles/kernel/svm/svm_wave.h intern/cycles/kernel/svm/wave.h
R099 intern/cycles/kernel/svm/svm_wavelength.h intern/cycles/kernel/svm/wavelength.h
R099 intern/cycles/kernel/svm/svm_white_noise.h intern/cycles/kernel/svm/white_noise.h
R099 intern/cycles/kernel/svm/svm_wireframe.h intern/cycles/kernel/svm/wireframe.h
R100 intern/cycles/kernel/kernel_textures.h intern/cycles/kernel/textures.h
R099 intern/cycles/kernel/kernel_types.h intern/cycles/kernel/types.h
R097 intern/cycles/kernel/util/util_color.h intern/cycles/kernel/util/color.h
R100 intern/cycles/kernel/util/util_differential.h intern/cycles/kernel/util/differential.h
R100 intern/cycles/kernel/util/util_lookup_table.h intern/cycles/kernel/util/lookup_table.h
R097 intern/cycles/kernel/util/util_profiling.h intern/cycles/kernel/util/profiling.h
M intern/cycles/scene/alembic.cpp
M intern/cycles/scene/alembic.h
M intern/cycles/scene/alembic_read.cpp
M intern/cycles/scene/alembic_read.h
M intern/cycles/scene/attribute.cpp
M intern/cycles/scene/attribute.h
M intern/cycles/scene/background.cpp
M intern/cycles/scene/background.h
M intern/cycles/scene/bake.cpp
M intern/cycles/scene/bake.h
M intern/cycles/scene/camera.cpp
M intern/cycles/scene/camera.h
M intern/cycles/scene/colorspace.cpp
M intern/cycles/scene/colorspace.h
M intern/cycles/scene/constant_fold.cpp
M intern/cycles/scene/constant_fold.h
M intern/cycles/scene/curves.cpp
M intern/cycles/scene/curves.h
M intern/cycles/scene/film.cpp
M intern/cycles/scene/film.h
M intern/cycles/scene/geometry.cpp
M intern/cycles/scene/geometry.h
M intern/cycles/scene/hair.cpp
M intern/cycles/scene/image.cpp
M intern/cycles/scene/image.h
M intern/cycles/scene/image_oiio.cpp
M intern/cycles/scene/image_sky.cpp
M intern/cycles/scene/image_vdb.cpp
M intern/cycles/scene/integrator.cpp
M intern/cycles/scene/integrator.h
M intern/cycles/scene/jitter.h
M intern/cycles/scene/light.cpp
M intern/cycles/scene/light.h
M intern/cycles/scene/mesh.cpp
M intern/cycles/scene/mesh.h
M intern/cycles/scene/mesh_displace.cpp
M intern/cycles/scene/mesh_subdivision.cpp
M intern/cycles/scene/object.cpp
M intern/cycles/scene/object.h
M intern/cycles/scene/osl.cpp
M intern/cycles/scene/osl.h
M intern/cycles/scene/particles.cpp
M intern/cycles/scene/particles.h
M intern/cycles/scene/pass.cpp
M intern/cycles/scene/pass.h
M intern/cycles/scene/procedural.cpp
M intern/cycles/scene/scene.cpp
M intern/cycles/scene/scene.h
M intern/cycles/scene/shader.cpp
M intern/cycles/scene/shader.h
M intern/cycles/scene/shader_graph.cpp
M intern/cycles/scene/shader_graph.h
M intern/cycles/scene/shader_nodes.cpp
M intern/cycles/scene/shader_nodes.h
M intern/cycles/scene/sobol.cpp
M intern/cycles/scene/sobol.h
M intern/cycles/scene/stats.cpp
M intern/cycles/scene/stats.h
M intern/cycles/scene/svm.cpp
M intern/cycles/scene/svm.h
M intern/cycles/scene/tables.cpp
M intern/cycles/scene/tables.h
M intern/cycles/scene/volume.cpp
M intern/cycles/session/buffers.cpp
M intern/cycles/session/buffers.h
M intern/cycles/session/display_driver.h
M intern/cycles/session/merge.cpp
M intern/cycles/session/merge.h
M intern/cycles/session/output_driver.h
M intern/cycles/session/session.cpp
M intern/cycles/session/session.h
M intern/cycles/session/tile.cpp
M intern/cycles/session/tile.h
M intern/cycles/subd/CMakeLists.txt
R099 intern/cycles/subd/subd_dice.cpp intern/cycles/subd/dice.cpp
R096 intern/cycles/subd/subd_dice.h intern/cycles/subd/dice.h
R096 intern/cycles/subd/subd_patch.cpp intern/cycles/subd/patch.cpp
R095 intern/cycles/subd/subd_patch.h intern/cycles/subd/patch.h
R098 intern/cycles/subd/subd_patch_table.cpp intern/cycles/subd/patch_table.cpp
R096 intern/cycles/subd/subd_patch_table.h intern/cycles/subd/patch_table.h
R098 intern/cycles/subd/subd_split.cpp intern/cycles/subd/split.cpp
R093 intern/cycles/subd/subd_split.h intern/cycles/subd/split.h
R098 intern/cycles/subd/subd_subpatch.h intern/cycles/subd/subpatch.h
M intern/cycles/test/CMakeLists.txt
M intern/cycles/test/integrator_adaptive_sampling_test.cpp
M intern/cycles/test/integrator_tile_test.cpp
M intern/cycles/test/render_graph_finalize_test.cpp
M intern/cycles/test/util_aligned_malloc_test.cpp
M intern/cycles/test/util_avxf_test.h
M intern/cycles/test/util_math_test.cpp
M intern/cycles/test/util_path_test.cpp
M intern/cycles/test/util_string_test.cpp
M intern/cycles/test/util_task_test.cpp
M intern/cycles/test/util_time_test.cpp
M intern/cycles/test/util_transform_test.cpp
M intern/cycles/util/CMakeLists.txt
R100 intern/cycles/util/util_algorithm.h intern/cycles/util/algorithm.h
R096 intern/cycles/util/util_aligned_malloc.cpp intern/cycles/util/aligned_malloc.cpp
R097 intern/cycles/util/util_aligned_malloc.h intern/cycles/util/aligned_malloc.h
R100 intern/cycles/util/util_args.h intern/cycles/util/args.h
R097 intern/cycles/util/util_array.h intern/cycles/util/array.h
R100 intern/cycles/util/util_atomic.h intern/cycles/util/atomic.h
R100 intern/cycles/util/util_avxb.h intern/cycles/util/avxb.h
R100 intern/cycles/util/util_avxf.h intern/cycles/util/avxf.h
R100 intern/cycles/util/util_avxi.h intern/cycles/util/avxi.h
R098 intern/cycles/util/util_boundbox.h intern/cycles/util/boundbox.h
R098 intern/cycles/util/util_color.h intern/cycles/util/color.h
R096 intern/cycles/util/util_debug.cpp intern/cycles/util/debug.cpp
R099 intern/cycles/util/util_debug.h intern/cycles/util/debug.h
R100 intern/cycles/util/util_defines.h intern/cycles/util/defines.h
R100 intern/cycles/util/util_deque.h intern/cycles/util/deque.h
R098 intern/cycles/util/util_disjoint_set.h intern/cycles/util/disjoint_set.h
R100 intern/cycles/util/util_foreach.h intern/cycles/util/foreach.h
R100 intern/cycles/util/util_function.h intern/cycles/util/function.h
R093 intern/cycles/util/util_guarded_allocator.cpp intern/cycles/util/guarded_allocator.cpp
R100 intern/cycles/util/util_guarded_allocator.h intern/cycles/util/guarded_allocator.h
R098 intern/cycles/util/util_half.h intern/cycles/util/half.h
R099 intern/cycles/util/util_hash.h intern/cycles/util/hash.h
R099 intern/cycles/util/util_ies.cpp intern/cycles/util/ies.cpp
R096 intern/cycles/util/util_ies.h intern/cycles/util/ies.h
R096 intern/cycles/util/util_image.h intern/cycles/util/image.h
R098 intern/cycles/util/util_image_impl.h intern/cycles/util/image_impl.h
R100 intern/cycles/util/util_list.h intern/cycles/util/list.h
R096 intern/cycles/util/util_logging.cpp intern/cycles/util/log.cpp
R100 intern/cycles/util/util_logging.h intern/cycles/util/log.h
R100 intern/cycles/util/util_map.h intern/cycles/util/map.h
R098 intern/cycles/util/util_math.h intern/cycles/util/math.h
R095 intern/cycles/util/util_math_cdf.cpp intern/cycles/util/math_cdf.cpp
R096 intern/cycles/util/util_math_cdf.h intern/cycles/util/math_cdf.h
R100 intern/cycles/util/util_math_fast.h intern/cycles/util/math_fast.h
R099 intern/cycles/util/util_math_float2.h intern/cycles/util/math_float2.h
R099 intern/cycles/util/util_math_float3.h intern/cycles/util/math_float3.h
R099 intern/cycles/util/util_math_float4.h intern/cycles/util/math_float4.h
R096 intern/cycles/util/util_math_int2.h intern/cycles/util/math_int2.h
R097 intern/cycles/util/util_math_int3.h intern/cycles/util/math_int3.h
R098 intern/cycles/util/util_math_int4.h intern/cycles/util/math_int4.h
R100 intern/cycles/util/util_math_intersect.h intern/cycles/util/math_intersect.h
R100 intern/cycles/util/util_math_matrix.h intern/cycles/util/math_matrix.h
R099 intern/cycles/util/util_md5.cpp intern/cycles/util/md5.cpp
R096 intern/cycles/util/util_md5.h intern/cycles/util/md5.h
R097 intern/cycles/util/util_murmurhash.cpp intern/cycles/util/murmurhash.cpp
R096 intern/cycles/util/util_murmurhash.h intern/cycles/util/murmurhash.h
R100 intern/cycles/util/util_opengl.h intern/cycles/util/opengl.h
R097 intern/cycles/util/util_openimagedenoise.h intern/cycles/util/openimagedenoise.h
R100 intern/cycles/util/util_openvdb.h intern/cycles/util/openvdb.h
R100 intern/cycles/util/util_optimization.h intern/cycles/util/optimization.h
R100 intern/cycles/util/util_param.h intern/cycles/util/param.h
R099 intern/cycles/util/util_path.cpp intern/cycles/util/path.cpp
R095 intern/cycles/util/util_path.h intern/cycles/util/path.h
R097 intern/cycles/util/util_profiling.cpp intern/cycles/util/profiling.cpp
R098 intern/cycles/util/util_profiling.h intern/cycles/util/profiling.h
R098 intern/cycles/util/util_progress.h intern/cycles/util/progress.h
R099 intern/cycles/util/util_projection.h intern/cycles/util/projection.h
R100 intern/cycles/util/util_queue.h intern/cycles/util/queue.h
R098 intern/cycles/util/util_rect.h intern/cycles/util/rect.h
R097 intern/cycles/util/util_semaphore.h intern/cycles/util/semaphore.h
R100 intern/cycles/util/util_set.h intern/cycles/util/set.h
R098 intern/cycles/util/util_simd.cpp intern/cycles/util/simd.cpp
R099 intern/cycles/util/util_simd.h intern/cycles/util/simd.h
R100 intern/cycles/util/util_sseb.h intern/cycles/util/sseb.h
R099 intern/cycles/util/util_ssef.h intern/cycles/util/ssef.h
R100 intern/cycles/util/util_ssei.h intern/cycles/util/ssei.h
R100 intern/cycles/util/util_stack_allocator.h intern/cycles/util/stack_allocator.h
R100 intern/cycles/util/util_static_assert.h intern/cycles/util/static_assert.h
R094 intern/cycles/util/util_stats.h intern/cycles/util/stats.h
R098 intern/cycles/util/util_string.cpp intern/cycles/util/string.cpp
R095 intern/cycles/util/util_string.h intern/cycles/util/string.h
R098 intern/cycles/util/util_system.cpp intern/cycles/util/system.cpp
R097 intern/cycles/util/util_system.h intern/cycles/util/system.h
R096 intern/cycles/util/util_task.cpp intern/cycles/util/task.cpp
R096 intern/cycles/util/util_task.h intern/cycles/util/task.h
R098 intern/cycles/util/util_tbb.h intern/cycles/util/tbb.h
R098 intern/cycles/util/util_texture.h intern/cycles/util/texture.h
R094 intern/cycles/util/util_thread.cpp intern/cycles/util/thread.cpp
R097 intern/cycles/util/util_thread.h intern/cycles/util/thread.h
R096 intern/cycles/util/util_time.cpp intern/cycles/util/time.cpp
R096 intern/cycles/util/util_time.h intern/cycles/util/time.h
R098 intern/cycles/util/util_transform.cpp intern/cycles/util/transform.cpp
R099 intern/cycles/util/util_transform.h intern/cycles/util/transform.h
R059 intern/cycles/util/util_types.h intern/cycles/util/types.h
R094 intern/cycles/util/util_types_float2.h intern/cycles/util/types_float2.h
R095 intern/cycles/util/util_types_float2_impl.h intern/cycles/util/types_float2_impl.h
R096 intern/cycles/util/util_types_float3.h intern/cycles/util/types_float3.h
R097 intern/cycles/util/util_types_float3_impl.h intern/cycles/util/types_float3_impl.h
R096 intern/cycles/util/util_types_float4.h intern/cycles/util/types_float4.h
R097 intern/cycles/util/util_types_float4_impl.h intern/cycles/util/types_float4_impl.h
R097 intern/cycles/util/util_types_float8.h intern/cycles/util/types_float8.h
R097 intern/cycles/util/util_types_float8_impl.h intern/cycles/util/types_float8_impl.h
R093 intern/cycles/util/util_types_int2.h intern/cycles/util/types_int2.h
R094 intern/cycles/util/util_types_int2_impl.h intern/cycles/util/types_int2_impl.h
R096 intern/cycles/util/util_types_int3.h intern/cycles/util/types_int3.h
R096 intern/cycles/util/util_types_int3_impl.h intern/cycles/util/types_int3_impl.h
R096 intern/cycles/util/util_types_int4.h intern/cycles/util/types_int4.h
R097 intern/cycles/util/util_types_int4_impl.h intern/cycles/util/types_int4_impl.h
R094 intern/cycles/util/util_types_uchar2.h intern/cycles/util/types_uchar2.h
R094 intern/cycles/util/util_types_uchar2_impl.h intern/cycles/util/types_uchar2_impl.h
R094 intern/cycles/util/util_types_uchar3.h intern/cycles/util/types_uchar3.h
R094 intern/cycles/util/util_types_uchar3_impl.h intern/cycles/util/types_uchar3_impl.h
R094 intern/cycles/util/util_types_uchar4.h intern/cycles/util/types_uchar4.h
R094 intern/cycles/util/util_types_uchar4_impl.h intern/cycles/util/types_uchar4_impl.h
R094 intern/cycles/util/util_types_uint2.h intern/cycles/util/types_uint2.h
R094 intern/cycles/util/util_types_uint2_impl.h intern/cycles/util/types_uint2_impl.h
R094 intern/cycles/util/util_types_uint3.h intern/cycles/util/types_uint3.h
R094 intern/cycles/util/util_types_uint3_impl.h intern/cycles/util/types_uint3_impl.h
R094 intern/cycles/util/util_types_uint4.h intern/cycles/util/types_uint4.h
R094 intern/cycles/util/util_types_uint4_impl.h intern/cycles/util/types_uint4_impl.h
R093 intern/cycles/util/util_types_ushort4.h intern/cycles/util/types_ushort4.h
R094 intern/cycles/util/util_types_vector3.h intern/cycles/util/types_vector3.h
R094 intern/cycles/util/util_types_vector3_impl.h intern/cycles/util/types_vector3_impl.h
R100 intern/cycles/util/util_unique_ptr.h intern/cycles/util/unique_ptr.h
R093 intern/cycles/util/util_vector.h intern/cycles/util/vector.h
R100 intern/cycles/util/util_version.h intern/cycles/util/version.h
R097 intern/cycles/util/util_view.cpp intern/cycles/util/view.cpp
R100 intern/cycles/util/util_view.h intern/cycles/util/view.h
R098 intern/cycles/util/util_windows.cpp intern/cycles/util/windows.cpp
R100 intern/cycles/util/util_windows.h intern/cycles/util/windows.h
R100 intern/cycles/util/util_xml.h intern/cycles/util/xml.h
===================================================================
diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp
index 1ad70a376ed..38771b8aed8 100644
--- a/intern/cycles/app/cycles_server.cpp
+++ b/intern/cycles/app/cycles_server.cpp
@@ -18,13 +18,13 @@
#include "device/device.h"
-#include "util/util_args.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_stats.h"
-#include "util/util_string.h"
-#include "util/util_task.h"
+#include "util/args.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/stats.h"
+#include "util/string.h"
+#include "util/task.h"
using namespace ccl;
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 800227ccf48..0032938b116 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -23,24 +23,24 @@
#include "session/buffers.h"
#include "session/session.h"
-#include "util/util_args.h"
-#include "util/util_foreach.h"
-#include "util/util_function.h"
-#include "util/util_image.h"
-#include "util/util_logging.h"
-#include "util/util_path.h"
-#include "util/util_progress.h"
-#include "util/util_string.h"
-#include "util/util_time.h"
-#include "util/util_transform.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_version.h"
+#include "util/args.h"
+#include "util/foreach.h"
+#include "util/function.h"
+#include "util/image.h"
+#include "util/log.h"
+#include "util/path.h"
+#include "util/progress.h"
+#include "util/string.h"
+#include "util/time.h"
+#include "util/transform.h"
+#include "util/unique_ptr.h"
+#include "util/version.h"
#include "app/cycles_xml.h"
#include "app/oiio_output_driver.h"
#ifdef WITH_CYCLES_STANDALONE_GUI
-# include "util/util_view.h"
+# include "util/view.h"
#endif
#include "app/cycles_xml.h"
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 1ced74b6136..6144d2c60a9 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -35,14 +35,14 @@
#include "scene/shader_graph.h"
#include "scene/shader_nodes.h"
-#include "subd/subd_patch.h"
-#include "subd/subd_split.h"
-
-#include "util/util_foreach.h"
-#include "util/util_path.h"
-#include "util/util_projection.h"
-#include "util/util_transform.h"
-#include "util/util_xml.h"
+#include "subd/patch.h"
+#include "subd/split.h"
+
+#include "util/foreach.h"
+#include "util/path.h"
+#include "util/projection.h"
+#include "util/transform.h"
+#include "util/xml.h"
#include "app/cycles_xml.h"
diff --git a/intern/cycles/app/oiio_output_driver.h b/intern/cycles/app/oiio_output_driver.h
index a6984938fe7..a5c88e0e890 100644
--- a/intern/cycles/app/oiio_output_driver.h
+++ b/intern/cycles/app/oiio_output_driver.h
@@ -16,11 +16,11 @@
#include "session/output_driver.h"
-#include "util/util_function.h"
-#include "util/util_image.h"
-#include "util/util_string.h"
-#include "util/util_unique_ptr.h"
-#include "util/util_vector.h"
+#include "util/function.h"
+#include "util/image.h"
+#include "util/string.h"
+#include "util/unique_ptr.h"
+#include "util/vector.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index d948f2b3118..149967ad331 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -29,39 +29,39 @@ set(INC_SYS
)
set(SRC
- blender_camera.cpp
- blender_device.cpp
- blender_display_driver.cpp
- blender_image.cpp
- blender_geometry.cpp
- blender_light.cpp
- blender_mesh.cpp
- blender_object.cpp
- blender_object_cull.cpp
- blender_output_driver.cpp
- blender_particles.cpp
- blender_curves.cpp
- blender_logging.cpp
- blender_python.cpp
- blender_session.cpp
- blender_shader.cpp
- blender_sync.cpp
- blender_texture.cpp
- blender_viewport.cpp
- blender_volume.cpp
+ camera.cpp
+ device.cpp
+ display_driver.cpp
+ image.cpp
+ geometry.cpp
+ light.cpp
+ mesh.cpp
+ object.cpp
+ object_cull.cpp
+ output_driver.cpp
+ particles.cpp
+ curves.cpp
+ logging.cpp
+ python.cpp
+ session.cpp
+ shader.cpp
+ sync.cpp
+ texture.cpp
+ viewport.cpp
+ volume.cpp
CCL_api.h
- blender_device.h
- blender_display_driver.h
- blender_id_map.h
- blender_image.h
- blender_object_cull.h
- blender_output_driver.h
- blender_sync.h
- blender_session.h
- blender_texture.h
- blender_util.h
- blender_viewport.h
+ device.h
+ display_driver.h
+ id_map.h
+ image.h
+ object_cull.h
+ output_driver.h
+ sync.h
+ session.h
+ texture.h
+ util.h
+ viewport.h
)
set(LIB
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/camera.cpp
similarity index 99%
rename from intern/cycles/blender/blender_camera.cpp
rename to intern/cycles/blender/camera.cpp
index 670e25841f5..f87ebe39d21 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/camera.cpp
@@ -17,10 +17,10 @@
#include "scene/camera.h"
#include "scene/scene.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
-#include "util/util_logging.h"
+#include "util/log.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/curves.cpp
similarity index 99%
rename from intern/cycles/blender/blender_curves.cpp
rename to intern/cycles/blender/curves.cpp
index 84333faaa23..816b296519b 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/curves.cpp
@@ -14,20 +14,20 @@
* limitations under the License.
*/
+#include "scene/curves.h"
#include "scene/attribute.h"
#include "scene/camera.h"
-#include "scene/curves.h"
#include "scene/hair.h"
#include "scene/object.h"
#include "scene/scene.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
-#include "util/util_color.h"
-#include "util/util_foreach.h"
-#include "util/util_hash.h"
-#include "util/util_logging.h"
+#include "util/color.h"
+#include "util/foreach.h"
+#include "util/hash.h"
+#include "util/log.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/device.cpp
similarity index 96%
rename from intern/cycles/blender/blender_device.cpp
rename to intern/cycles/blender/device.cpp
index 7bed33855c2..9fabc33a96b 100644
--- a/intern/cycles/blender/blender_device.cpp
+++ b/intern/cycles/blender/device.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "blender/blender_device.h"
-#include "blender/blender_session.h"
-#include "blender/blender_util.h"
+#include "blender/device.h"
+#include "blender/session.h"
+#include "blender/util.h"
-#include "util/util_foreach.h"
+#include "util/foreach.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/device.h
similarity index 100%
rename from intern/cycles/blender/blender_device.h
rename to intern/cycles/blender/device.h
diff --git a/intern/cycles/blender/blender_display_driver.cpp b/intern/cycles/blender/display_driver.cpp
similarity index 99%
rename from intern/cycles/blender/blender_display_driver.cpp
rename to intern/cycles/blender/display_driver.cpp
index cdf175f91d0..d5f6d85251e 100644
--- a/intern/cycles/blender/blender_display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "blender/blender_display_driver.h"
+#include "blender/display_driver.h"
#include "device/device.h"
-#include "util/util_logging.h"
-#include "util/util_opengl.h"
+#include "util/log.h"
+#include "util/opengl.h"
extern "C" {
struct RenderEngine;
diff --git a/intern/cycles/blender/blender_display_driver.h b/intern/cycles/blender/display_driver.h
similarity index 99%
rename from intern/cycles/blender/blender_display_driver.h
rename to intern/cycles/blender/display_driver.h
index 800d0791041..66cfc8cffcc 100644
--- a/intern/cycles/blender/blender_display_driver.h
+++ b/intern/cycles/blender/display_driver.h
@@ -24,8 +24,8 @@
#include "session/display_driver.h"
-#include "util/util_thread.h"
-#include "util/util_unique_ptr.h"
+#include "util/thread.h"
+#include "util/unique_ptr.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/geometry.cpp
similarity index 98%
rename from intern/cycles/blender/blender_geometry.cpp
rename to intern/cycles/blender/geometry.cpp
index b4b0d04d104..479e76f68bc 100644
--- a/intern/cycles/blender/blender_geometry.cpp
+++ b/intern/cycles/blender/geometry.cpp
@@ -21,11 +21,11 @@
#include "scene/object.h"
#include "scene/volume.h"
-#include "blender/blender_sync.h"
-#include "blender/blender_util.h"
+#include "blender/sync.h"
+#include "blender/util.h"
-#include "util/util_foreach.h"
-#include "util/util_task.h"
+#include "util/foreach.h"
+#include "util/task.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/id_map.h
similarity index 98%
rename from intern/cycles/blender/blender_id_map.h
rename to intern/cycles/blender/id_map.h
index 27a53a90f12..c1b800026c3 100644
--- a/intern/cycles/blender/blender_id_map.h
+++ b/intern/cycles/blender/id_map.h
@@ -22,9 +22,9 @@
#include "scene/geometry.h"
#include "scene/scene.h"
-#include "util/util_map.h"
-#include "util/util_set.h"
-#include "util/util_vector.h"
+#include "util/map.h"
+#include "util/set.h"
+#include "util/vector.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/blender/blender_image.cpp b/intern/cycles/blender/image.cpp
similarity index 98%
rename from intern/cycles/blender/blender_image.cpp
rename to intern/cycles/blender/image.cpp
index f27275bd457..3ea3a47c1f4 100644
--- a/intern/cycles/blender/blender_image.cpp
+++ b/intern/cycles/blender/image.cpp
@@ -16,9 +16,9 @@
#include "MEM_guardedalloc.h"
-#include "blender/blender_image.h"
-#include "blender/blender_session.h"
-#include "blender/blender_util.h"
+#include "blender/image.h"
+#include "blender/session.h"
+#include "blender/util.h"
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list