Commit: 9f07d73e4598c7746218bc6b64cf2f88908645e9 Author: Brecht Van Lommel Date: Sun Oct 24 14:19:19 2021 +0200 Branches: temp-cycles-source-reorganize https://developer.blender.org/rB9f07d73e4598c7746218bc6b64cf2f88908645e9
Cycles: changes to source code folders structure * Split render/ into scene/ and session/. The scene/ folder now contains the scene and its nodes. The session/ folder contains the render session and associated data structures like drivers and render buffers. * Move top level kernel headers into new folders kernel/camera/, kernel/film/, kernel/light/, kernel/sample/, kernel/util/ * Move integrator related kernel headers into kernel/integrator/ * Move OSL shaders from kernel/shaders/ to kernel/osl/shaders/ 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/CMakeLists.txt M intern/cycles/app/CMakeLists.txt 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 M intern/cycles/blender/blender_camera.cpp M intern/cycles/blender/blender_curves.cpp M intern/cycles/blender/blender_display_driver.h M intern/cycles/blender/blender_geometry.cpp M intern/cycles/blender/blender_id_map.h M intern/cycles/blender/blender_image.h M intern/cycles/blender/blender_light.cpp M intern/cycles/blender/blender_mesh.cpp M intern/cycles/blender/blender_object.cpp M intern/cycles/blender/blender_object_cull.cpp M intern/cycles/blender/blender_output_driver.h M intern/cycles/blender/blender_particles.cpp M intern/cycles/blender/blender_python.cpp M intern/cycles/blender/blender_session.cpp M intern/cycles/blender/blender_session.h M intern/cycles/blender/blender_shader.cpp M intern/cycles/blender/blender_sync.cpp M intern/cycles/blender/blender_sync.h M intern/cycles/blender/blender_util.h M intern/cycles/blender/blender_viewport.cpp M intern/cycles/blender/blender_viewport.h M intern/cycles/blender/blender_volume.cpp M intern/cycles/bvh/CMakeLists.txt M intern/cycles/bvh/bvh2.cpp M intern/cycles/bvh/bvh_build.cpp M intern/cycles/bvh/bvh_embree.cpp M intern/cycles/bvh/bvh_split.cpp M intern/cycles/bvh/bvh_unaligned.cpp M intern/cycles/device/cpu/device_impl.cpp M intern/cycles/device/cuda/device_impl.cpp M intern/cycles/device/device_denoise.h M intern/cycles/device/device_graphics_interop.h M intern/cycles/device/hip/device_impl.cpp M intern/cycles/device/multi/device.cpp M intern/cycles/device/optix/device_impl.cpp M intern/cycles/integrator/CMakeLists.txt M intern/cycles/integrator/denoiser.cpp M intern/cycles/integrator/denoiser_device.cpp M intern/cycles/integrator/denoiser_oidn.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/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_tile.cpp M intern/cycles/integrator/path_trace_tile.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_gpu.cpp M intern/cycles/integrator/render_scheduler.cpp M intern/cycles/integrator/render_scheduler.h M intern/cycles/integrator/work_tile_scheduler.cpp M intern/cycles/kernel/CMakeLists.txt R097 intern/cycles/kernel/kernel_bake.h intern/cycles/kernel/bake/bake.h R099 intern/cycles/kernel/kernel_camera.h intern/cycles/kernel/camera/camera.h R100 intern/cycles/kernel/kernel_projection.h intern/cycles/kernel/camera/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/closure/bsdf_util.h M intern/cycles/kernel/device/cpu/globals.h M intern/cycles/kernel/device/cpu/kernel_arch_impl.h M intern/cycles/kernel/device/cuda/globals.h M intern/cycles/kernel/device/gpu/kernel.h R100 intern/cycles/kernel/kernel_work_stealing.h intern/cycles/kernel/device/gpu/work_stealing.h M intern/cycles/kernel/device/hip/globals.h M intern/cycles/kernel/device/optix/globals.h R099 intern/cycles/kernel/kernel_accumulate.h intern/cycles/kernel/film/film_accumulate.h R099 intern/cycles/kernel/kernel_adaptive_sampling.h intern/cycles/kernel/film/film_adaptive_sampling.h R100 intern/cycles/kernel/kernel_id_passes.h intern/cycles/kernel/film/film_id_passes.h R099 intern/cycles/kernel/kernel_passes.h intern/cycles/kernel/film/film_passes.h R100 intern/cycles/kernel/kernel_film.h intern/cycles/kernel/film/film_read.h R100 intern/cycles/kernel/kernel_write_passes.h intern/cycles/kernel/film/film_write_passes.h M intern/cycles/kernel/geom/geom_patch.h M intern/cycles/kernel/geom/geom_primitive.h M intern/cycles/kernel/geom/geom_triangle_intersect.h M intern/cycles/kernel/integrator/integrator_init_from_bake.h M intern/cycles/kernel/integrator/integrator_init_from_camera.h M intern/cycles/kernel/integrator/integrator_intersect_closest.h M intern/cycles/kernel/integrator/integrator_intersect_volume_stack.h R099 intern/cycles/kernel/kernel_path_state.h intern/cycles/kernel/integrator/integrator_path_state.h M intern/cycles/kernel/integrator/integrator_shade_background.h M intern/cycles/kernel/integrator/integrator_shade_light.h M intern/cycles/kernel/integrator/integrator_shade_shadow.h M intern/cycles/kernel/integrator/integrator_shade_surface.h M intern/cycles/kernel/integrator/integrator_shade_volume.h R099 intern/cycles/kernel/kernel_shader.h intern/cycles/kernel/integrator/integrator_shader_eval.h R098 intern/cycles/kernel/kernel_shadow_catcher.h intern/cycles/kernel/integrator/integrator_shadow_catcher.h M intern/cycles/kernel/integrator/integrator_state_util.h M intern/cycles/kernel/integrator/integrator_subsurface.h M intern/cycles/kernel/integrator/integrator_subsurface_random_walk.h D intern/cycles/kernel/kernel_math.h M intern/cycles/kernel/kernel_types.h R099 intern/cycles/kernel/kernel_light.h intern/cycles/kernel/light/light.h R099 intern/cycles/kernel/kernel_light_background.h intern/cycles/kernel/light/light_background.h R099 intern/cycles/kernel/kernel_light_common.h intern/cycles/kernel/light/light_common.h R097 intern/cycles/kernel/kernel_emission.h intern/cycles/kernel/light/light_sample.h M intern/cycles/kernel/osl/CMakeLists.txt M intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp M intern/cycles/kernel/osl/osl_bssrdf.cpp M intern/cycles/kernel/osl/osl_closures.cpp M intern/cycles/kernel/osl/osl_services.cpp M intern/cycles/kernel/osl/osl_shader.cpp R100 intern/cycles/kernel/shaders/CMakeLists.txt intern/cycles/kernel/osl/shaders/CMakeLists.txt R100 intern/cycles/kernel/shaders/node_absorption_volume.osl intern/cycles/kernel/osl/shaders/node_absorption_volume.osl R100 intern/cycles/kernel/shaders/node_add_closure.osl intern/cycles/kernel/osl/shaders/node_add_closure.osl R100 intern/cycles/kernel/shaders/node_ambient_occlusion.osl intern/cycles/kernel/osl/shaders/node_ambient_occlusion.osl R100 intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl intern/cycles/kernel/osl/shaders/node_anisotropic_bsdf.osl R100 intern/cycles/kernel/shaders/node_attribute.osl intern/cycles/kernel/osl/shaders/node_attribute.osl R100 intern/cycles/kernel/shaders/node_background.osl intern/cycles/kernel/osl/shaders/node_background.osl R100 intern/cycles/kernel/shaders/node_bevel.osl intern/cycles/kernel/osl/shaders/node_bevel.osl R100 intern/cycles/kernel/shaders/node_blackbody.osl intern/cycles/kernel/osl/shaders/node_blackbody.osl R100 intern/cycles/kernel/shaders/node_brick_texture.osl intern/cycles/kernel/osl/shaders/node_brick_texture.osl R100 intern/cycles/kernel/shaders/node_brightness.osl intern/cycles/kernel/osl/shaders/node_brightness.osl R100 intern/cycles/kernel/shaders/node_bump.osl intern/cycles/kernel/osl/shaders/node_bump.osl R100 intern/cycles/kernel/shaders/node_camera.osl intern/cycles/kernel/osl/shaders/node_camera.osl R100 intern/cycles/kernel/shaders/node_checker_texture.osl intern/cycles/kernel/osl/shaders/node_checker_texture.osl R100 intern/cycles/kernel/shaders/node_clamp.osl intern/cycles/kernel/osl/shaders/node_clamp.osl R100 intern/cycles/kernel/shaders/node_color.h intern/cycles/kernel/osl/shaders/node_color.h R100 intern/cycles/kernel/shaders/node_combine_hsv.osl intern/cycles/kernel/osl/shaders/node_combine_hsv.osl R100 intern/cycles/kernel/shaders/node_combine_rgb.osl intern/cycles/kernel/osl/shaders/node_combine_rgb.osl R100 intern/cycles/kernel/shaders/node_combine_xyz.osl intern/cycles/kernel/osl/shaders/node_combine_xyz.osl R100 intern/cycles/kernel/shaders/node_convert_from_color.osl intern/cycles/kernel/osl/shaders/node_convert_from_color.osl R100 intern/cycles/kernel/shaders/node_convert_from_float.osl intern/cycles/kernel/osl/shaders/node_convert_from_float.osl R100 intern/cycles/kernel/shaders/node_convert_from_int.osl intern/cycles/kernel/osl/shaders/node_convert_from_int.osl R100 intern/cycles/kernel/shaders/node_convert_from_normal.osl intern/cycles/kernel/osl/shaders/node_convert_from_normal.osl R100 intern/cycles/kernel/shaders/node_convert_from_point.osl intern/cycles/kernel/osl/shaders/node_convert_from_point.osl R100 intern/cycles/kernel/shaders/node_convert_from_string.osl intern/cycles/kernel/osl/shaders/node_convert_from_string.osl R100 intern/cycles/kernel/shaders/node_convert_from_vector.osl intern/cycles/kernel/osl/shaders/node_convert_from_vector.osl R100 intern/cycles/kernel/shaders/node_diffuse_bsdf.osl intern/cycles/kernel/osl/shaders/node_diffuse_bsdf.osl R100 intern/cycles/kernel/shaders/node_displacement.osl intern/cycles/kernel/osl/shaders/node_displacement.osl R100 intern/cycles/kernel/shaders/node_emission.osl intern/cycles/kernel/osl/shaders/node_emission.osl R100 intern/cycles/kernel/shaders/node_environment_texture.osl intern/cycles/kernel/osl/shaders/node_environment_texture.osl R100 intern/cycles/kernel/shaders/node_float_curve.osl intern/cycles/kernel/osl/shaders/node_float_curve.osl R100 intern/cycles/kernel/shaders/node_fresnel.h intern/cycles/kernel/osl/shaders/node_fresnel.h R100 intern/cycles/kernel/shaders/node_fresnel.osl intern/cycles/kernel/osl/shaders/node_fresnel.osl R100 intern/cycles/kernel/shaders/node_gamma.osl intern/cycles/kernel/osl/shaders/node_gamma.osl R100 intern/cycles/kernel/shaders/node_geometry.osl intern/cycles/kernel/osl/shaders/node_geometry.osl R100 intern/cycles/kernel/shaders/node_glass_bsdf.osl intern/cycles/kernel/osl/shaders/node_glass_bsdf.osl R100 intern/cycles/kernel/shaders/node_glossy_bsdf.osl intern/cycles/kernel/osl/shaders/node_glossy_bsdf.osl R100 intern/cycles/kernel/shaders/node_gradient_texture.osl intern/cycles/kernel/osl/shaders/node_gradient_texture.osl R100 intern/cycles/kernel/shaders/node_hair_bsdf.osl intern/cycles/kernel/osl/shaders/node_hair_bsdf.osl R100 intern/cycles/kernel/shaders/node_hair_info.osl intern/cycles/kernel/osl/shaders/node_hair_info.osl R100 intern/cycles/kernel/shaders/node_hash.h intern/cycles/kernel/osl/shaders/node_hash.h R100 intern/cycles/kernel/shaders/node_holdout.osl intern/cycles/kernel/osl/shaders/node_holdout.osl R100 intern/cycles/kernel/shaders/node_hsv.osl intern/cycles/kernel/osl/shaders/node_hsv.osl R100 intern/cycles/kernel/shaders/node_ies_light.osl intern/cycles/kernel/osl/shaders/node_ies_light.osl R100 intern/cycles/kernel/shaders/node_image_texture.osl intern/cycles/kernel/osl/shaders/node_image_texture.osl R100 intern/cycles/kernel/shaders/node_invert.osl intern/cycles/kernel/osl/shaders/node_invert.osl R100 intern/cycles/kernel/shaders/node_layer_weight.osl intern/cycles/kernel/osl/shaders/node_layer_weight.osl R100 intern/cycles/kernel/shaders/node_light_falloff.osl intern/cycles/kernel/osl/shaders/node_light_falloff.osl R100 intern/cycles/kernel/shaders/node_light_path.osl intern/cycles/kernel/osl/shaders/node_light_path.osl R100 intern/cycles/kernel/shaders/node_magic_texture.osl intern/cycles/kernel/osl/shaders/node_magic_texture.osl R100 intern/cycles/kernel/shaders/node_map_range.osl intern/cycles/kernel/osl/shaders/node_map_range.osl R100 intern/cycles/kernel/shaders/node_mapping.osl intern/cycles/kernel/osl/shaders/node_mapping.osl R100 intern/cycles/kernel/shaders/node_math.h intern/cycles/kernel/osl/shaders/node_math.h R100 intern/cycles/kernel/shaders/node_math.osl intern/cycles/kernel/osl/shaders/node_math.osl R100 intern/cycles/kernel/shaders/node_mix.osl intern/cycles/kernel/osl/shaders/node_mix.osl R100 intern/cycles/kernel/shaders/node_mix_closure.osl intern/cycles/kernel/osl/shaders/node_mix_closure.osl R100 intern/cycles/kernel/shaders/node_musgrave_texture.osl intern/cycles/kernel/osl/shaders/node_musgrave_texture.osl R100 intern/cycles/kernel/shaders/node_noise.h intern/cycles/kernel/osl/shaders/node_noise.h R100 intern/cycles/kernel/shaders/node_noise_texture.osl intern/cycles/kernel/osl/shaders/node_noise_texture.osl R100 intern/cycles/kernel/shaders/node_normal.osl intern/cycles/kernel/osl/shaders/node_normal.osl R100 intern/cycles/kernel/shaders/node_normal_map.osl intern/cycles/kernel/osl/shaders/node_normal_map.osl R100 intern/cycles/kernel/shaders/node_object_info.osl intern/cycles/kernel/osl/shaders/node_object_info.osl R100 intern/cycles/kernel/shaders/node_output_displacement.osl intern/cycles/kernel/osl/shaders/node_output_displacement.osl R100 intern/cycles/kernel/shaders/node_output_surface.osl intern/cycles/kernel/osl/shaders/node_output_surface.osl R100 intern/cycles/kernel/shaders/node_output_volume.osl intern/cycles/kernel/osl/shaders/node_output_volume.osl R100 intern/cycles/kernel/shaders/node_particle_info.osl intern/cycles/kernel/osl/shaders/node_particle_info.osl R100 intern/cycles/kernel/shaders/node_principled_bsdf.osl intern/cycles/kernel/osl/shaders/node_principled_bsdf.osl R100 intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl R100 intern/cycles/kernel/shaders/node_principled_volume.osl intern/cycles/kernel/osl/shaders/node_principled_volume.osl R100 intern/cycles/kernel/shaders/node_ramp_util.h intern/cycles/kernel/osl/shaders/node_ramp_util.h R100 intern/cycles/kernel/shaders/node_refraction_bsdf.osl intern/cycles/kernel/osl/shaders/node_refraction_bsdf.osl R100 intern/cycles/kernel/shaders/node_rgb_curves.osl intern/cycles/kernel/osl/shaders/node_rgb_curves.osl R100 intern/cycles/kernel/shaders/node_rgb_ramp.osl intern/cycles/kernel/osl/shaders/node_rgb_ramp.osl R100 intern/cycles/kernel/shaders/node_rgb_to_bw.osl intern/cycles/kernel/osl/shaders/node_rgb_to_bw.osl R100 intern/cycles/kernel/shaders/node_scatter_volume.osl intern/cycles/kernel/osl/shaders/node_scatter_volume.osl R100 intern/cycles/kernel/shaders/node_separate_hsv.osl intern/cycles/kernel/osl/shaders/node_separate_hsv.osl R100 intern/cycles/kernel/shaders/node_separate_rgb.osl intern/cycles/kernel/osl/shaders/node_separate_rgb.osl R100 intern/cycles/kernel/shaders/node_separate_xyz.osl intern/cycles/kernel/osl/shaders/node_separate_xyz.osl R100 intern/cycles/kernel/shaders/node_set_normal.osl intern/cycles/kernel/osl/shaders/node_set_normal.osl R100 intern/cycles/kernel/shaders/node_sky_texture.osl intern/cycles/kernel/osl/shaders/node_sky_texture.osl R100 intern/cycles/kernel/shaders/node_subsurface_scattering.osl intern/cycles/kernel/osl/shaders/node_subsurface_scattering.osl R100 intern/cycles/kernel/shaders/node_tangent.osl intern/cycles/kernel/osl/shaders/node_tangent.osl R100 intern/cycles/kernel/shaders/node_texture_coordinate.osl intern/cycles/kernel/osl/shaders/node_texture_coordinate.osl R100 intern/cycles/kernel/shaders/node_toon_bsdf.osl intern/cycles/kernel/osl/shaders/node_toon_bsdf.osl R100 intern/cycles/kernel/shaders/node_translucent_bsdf.osl intern/cycles/kernel/osl/shaders/node_translucent_bsdf.osl R100 intern/cycles/kernel/shaders/node_transparent_bsdf.osl intern/cycles/kernel/osl/shaders/node_transparent_bsdf.osl R100 intern/cycles/kernel/shaders/node_uv_map.osl intern/cycles/kernel/osl/shaders/node_uv_map.osl R100 intern/cycles/kernel/shaders/node_value.osl intern/cycles/kernel/osl/shaders/node_value.osl R100 intern/cycles/kernel/shaders/node_vector_curves.osl intern/cycles/kernel/osl/shaders/node_vector_curves.osl R100 intern/cycles/kernel/shaders/node_vector_displacement.osl intern/cycles/kernel/osl/shaders/node_vector_displacement.osl R100 intern/cycles/kernel/shaders/node_vector_math.osl intern/cycles/kernel/osl/shaders/node_vector_math.osl R100 intern/cycles/kernel/shaders/node_vector_rotate.osl intern/cycles/kernel/osl/shaders/node_vector_rotate.osl R100 intern/cycles/kernel/shaders/node_vector_transform.osl intern/cycles/kernel/osl/shaders/node_vector_transform.osl R100 intern/cycles/kernel/shaders/node_velvet_bsdf.osl intern/cycles/kernel/osl/shaders/node_velvet_bsdf.osl R100 intern/cycles/kernel/shaders/node_vertex_color.osl intern/cycles/kernel/osl/shaders/node_vertex_color.osl R100 intern/cycles/kernel/shaders/node_voronoi_texture.osl intern/cycles/kernel/osl/shaders/node_voronoi_texture.osl R100 intern/cycles/kernel/shaders/node_voxel_texture.osl intern/cycles/kernel/osl/shaders/node_voxel_texture.osl R100 intern/cycles/kernel/shaders/node_wave_texture.osl intern/cycles/kernel/osl/shaders/node_wave_texture.osl R100 intern/cycles/kernel/shaders/node_wavelength.osl intern/cycles/kernel/osl/shaders/node_wavelength.osl R100 intern/cycles/kernel/shaders/node_white_noise_texture.osl intern/cycles/kernel/osl/shaders/node_white_noise_texture.osl R100 intern/cycles/kernel/shaders/node_wireframe.osl intern/cycles/kernel/osl/shaders/node_wireframe.osl R100 intern/cycles/kernel/shaders/stdcycles.h intern/cycles/kernel/osl/shaders/stdcycles.h R100 intern/cycles/kernel/kernel_jitter.h intern/cycles/kernel/sample/sample_jitter.h A intern/cycles/kernel/sample/sample_lcg.h R057 intern/cycles/kernel/kernel_montecarlo.h intern/cycles/kernel/sample/sample_mapping.h A intern/cycles/kernel/sample/sample_mis.h R087 intern/cycles/kernel/kernel_random.h intern/cycles/kernel/sample/sample_pattern.h M intern/cycles/kernel/svm/svm_aov.h M intern/cycles/kernel/svm/svm_bevel.h M intern/cycles/kernel/svm/svm_displace.h M intern/cycles/kernel/svm/svm_tex_coord.h R100 intern/cycles/kernel/kernel_color.h intern/cycles/kernel/util/util_color.h R100 intern/cycles/kernel/kernel_differential.h intern/cycles/kernel/util/util_differential.h R100 intern/cycles/kernel/kernel_lookup_table.h intern/cycles/kernel/util/util_lookup_table.h R100 intern/cycles/kernel/kernel_profiling.h intern/cycles/kernel/util/util_profiling.h R087 intern/cycles/render/CMakeLists.txt intern/cycles/scene/CMakeLists.txt R099 intern/cycles/render/alembic.cpp intern/cycles/scene/alembic.cpp R099 intern/cycles/render/alembic.h intern/cycles/scene/alembic.h R099 intern/cycles/render/alembic_read.cpp intern/cycles/scene/alembic_read.cpp R100 intern/cycles/render/alembic_read.h intern/cycles/scene/alembic_read.h R099 intern/cycles/render/attribute.cpp intern/cycles/scene/attribute.cpp R099 intern/cycles/render/attribute.h intern/cycles/scene/attribute.h R095 intern/cycles/render/background.cpp intern/cycles/scene/background.cpp R100 intern/cycles/render/background.h intern/cycles/scene/background.h R092 intern/cycles/render/bake.cpp intern/cycles/scene/bake.cpp R097 intern/cycles/render/bake.h intern/cycles/scene/bake.h R098 intern/cycles/render/camera.cpp intern/cycles/scene/camera.cpp R100 intern/cycles/render/camera.h intern/cycles/scene/camera.h R099 intern/cycles/render/colorspace.cpp intern/cycles/scene/colorspace.cpp R100 intern/cycles/render/colorspace.h intern/cycles/scene/colorspace.h R099 intern/cycles/render/constant_fold.cpp intern/cycles/scene/constant_fold.cpp R100 intern/cycles/render/constant_fold.h intern/cycles/scene/constant_fold.h R095 intern/cycles/render/curves.cpp intern/cycles/scene/curves.cpp R098 intern/cycles/render/curves.h intern/cycles/scene/curves.h R098 intern/cycles/render/film.cpp intern/cycles/scene/film.cpp R099 intern/cycles/render/film.h intern/cycles/scene/film.h R099 intern/cycles/render/geometry.cpp intern/cycles/scene/geometry.cpp R099 intern/cycles/render/geometry.h intern/cycles/scene/geometry.h R099 intern/cycles/render/hair.cpp intern/cycles/scene/hair.cpp R099 intern/cycles/render/hair.h intern/cycles/scene/hair.h R099 intern/cycles/render/image.cpp intern/cycles/scene/image.cpp R099 intern/cycles/render/image.h intern/cycles/scene/image.h R099 intern/cycles/render/image_oiio.cpp intern/cycles/scene/image_oiio.cpp R098 intern/cycles/render/image_oiio.h intern/cycles/scene/image_oiio.h R098 intern/cycles/render/image_sky.cpp intern/cycles/scene/image_sky.cpp R098 intern/cycles/render/image_sky.h intern/cycles/scene/image_sky.h R099 intern/cycles/render/image_vdb.cpp intern/cycles/scene/image_vdb.cpp R098 intern/cycles/render/image_vdb.h intern/cycles/scene/image_vdb.h R097 intern/cycles/render/integrator.cpp intern/cycles/scene/integrator.cpp R100 intern/cycles/render/integrator.h intern/cycles/scene/integrator.h R099 intern/cycles/render/jitter.cpp intern/cycles/scene/jitter.cpp R100 intern/cycles/render/jitter.h intern/cycles/scene/jitter.h R099 intern/cycles/render/light.cpp intern/cycles/scene/light.cpp R099 intern/cycles/render/light.h intern/cycles/scene/light.h R099 intern/cycles/render/mesh.cpp intern/cycles/scene/mesh.cpp R098 intern/cycles/render/mesh.h intern/cycles/scene/mesh.h R099 intern/cycles/render/mesh_displace.cpp intern/cycles/scene/mesh_displace.cpp R099 intern/cycles/render/mesh_subdivision.cpp intern/cycles/scene/mesh_subdivision.cpp R099 intern/cycles/render/object.cpp intern/cycles/scene/object.cpp R098 intern/cycles/render/object.h intern/cycles/scene/object.h R099 intern/cycles/render/osl.cpp intern/cycles/scene/osl.cpp R098 intern/cycles/render/osl.h intern/cycles/scene/osl.h R097 intern/cycles/render/particles.cpp intern/cycles/scene/particles.cpp R100 intern/cycles/render/particles.h intern/cycles/scene/particles.h R099 intern/cycles/render/pass.cpp intern/cycles/scene/pass.cpp R100 intern/cycles/render/pass.h intern/cycles/scene/pass.h R097 intern/cycles/render/procedural.cpp intern/cycles/scene/procedural.cpp R100 intern/cycles/render/procedural.h intern/cycles/scene/procedural.h R098 intern/cycles/render/scene.cpp intern/cycles/scene/scene.cpp R099 intern/cycles/render/scene.h intern/cycles/scene/scene.h R098 intern/cycles/render/shader.cpp intern/cycles/scene/shader.cpp R099 intern/cycles/render/shader.h intern/cycles/scene/shader.h R099 intern/cycles/render/graph.cpp intern/cycles/scene/shader_graph.cpp R100 intern/cycles/render/graph.h intern/cycles/scene/shader_graph.h R099 intern/cycles/render/nodes.cpp intern/cycles/scene/shader_nodes.cpp R099 intern/cycles/render/nodes.h intern/cycles/scene/shader_nodes.h A intern/cycles/scene/sobol.cpp R100 intern/cycles/render/sobol.h intern/cycles/scene/sobol.h R099 intern/cycles/render/sobol.cpp intern/cycles/scene/sobol.tables R099 intern/cycles/render/stats.cpp intern/cycles/scene/stats.cpp R099 intern/cycles/render/stats.h intern/cycles/scene/stats.h R099 intern/cycles/render/svm.cpp intern/cycles/scene/svm.cpp R098 intern/cycles/render/svm.h intern/cycles/scene/svm.h R097 intern/cycles/render/tables.cpp intern/cycles/scene/tables.cpp R100 intern/cycles/render/tables.h intern/cycles/scene/tables.h R099 intern/cycles/render/volume.cpp intern/cycles/scene/volume.cpp R097 intern/cycles/render/volume.h intern/cycles/scene/volume.h A intern/cycles/session/CMakeLists.txt R099 intern/cycles/render/buffers.cpp intern/cycles/session/buffers.cpp R099 intern/cycles/render/buffers.h intern/cycles/session/buffers.h R099 intern/cycles/render/denoising.cpp intern/cycles/session/denoising.cpp R100 intern/cycles/render/denoising.h intern/cycles/session/denoising.h R100 intern/cycles/render/display_driver.h intern/cycles/session/display_driver.h R099 intern/cycles/render/merge.cpp intern/cycles/session/merge.cpp R100 intern/cycles/render/merge.h intern/cycles/session/merge.h R100 intern/cycles/render/output_driver.h intern/cycles/session/output_driver.h R097 intern/cycles/render/session.cpp intern/cycles/session/session.cpp R098 intern/cycles/render/session.h intern/cycles/session/session.h R099 intern/cycles/render/tile.cpp intern/cycles/session/tile.cpp R099 intern/cycles/render/tile.h intern/cycles/session/tile.h M intern/cycles/subd/subd_dice.cpp M intern/cycles/subd/subd_patch.cpp M intern/cycles/subd/subd_split.cpp M intern/cycles/test/CMakeLists.txt M intern/cycles/test/render_graph_finalize_test.cpp =================================================================== diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 2018c1d9648..b6f3926f329 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -400,7 +400,8 @@ add_subdirectory(doc) add_subdirectory(graph) add_subdirectory(integrator) add_subdirectory(kernel) -add_subdirectory(render) +add_subdirectory(scene) +add_subdirectory(session) add_subdirectory(subd) add_subdirectory(util) diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 3ed3f54ef9f..50600793854 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -25,7 +25,8 @@ set(INC_SYS set(LIBRARIES cycles_device cycles_kernel - cycles_render + cycles_scene + cycles_session cycles_bvh cycles_subd cycles_graph diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 00dc140648a..800227ccf48 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -17,11 +17,11 @@ #include <stdio.h> #include "device/device.h" -#include "render/buffers.h" -#include "render/camera.h" -#include "render/integrator.h" -#include "render/scene.h" -#include "render/session.h" +#include "scene/camera.h" +#include "scene/integrator.h" +#include "scene/scene.h" +#include "session/buffers.h" +#include "session/session.h" #include "util/util_args.h" #include "util/util_foreach.h" diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 0b83c60f32d..1ced74b6136 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -22,18 +22,18 @@ #include "graph/node_xml.h" -#include "render/background.h" -#include "render/camera.h" -#include "render/film.h" -#include "render/graph.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/mesh.h" -#include "render/nodes.h" -#include "render/object.h" -#include "render/osl.h" -#include "render/scene.h" -#include "render/shader.h" +#include "scene/background.h" +#include "scene/camera.h" +#include "scene/film.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/osl.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/shader_graph.h" +#include "scene/shader_nodes.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" diff --git a/intern/cycles/app/oiio_output_driver.h b/intern/cycles/app/oiio_output_driver.h index cdc4085d962..a6984938fe7 100644 --- a/intern/cycles/app/oiio_output_driver.h +++ b/intern/cycles/app/oiio_output_driver.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "render/output_driver.h" +#include "session/output_driver.h" #include "util/util_function.h" #include "util/util_image.h" diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index a0442b3394b..d948f2b3118 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -69,7 +69,8 @@ set(LIB cycles_device cycles_graph cycles_kernel - cycles_render + cycles_scene + cycles_session cycles_subd cycles_util diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 52acc2573f5..670e25841f5 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/camera.h" -#include "render/scene.h" +#include "scene/camera.h" +#include "scene/scene.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index b6b4f206620..84333faaa23 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -14,16 +14,17 @@ * limitations under the License. */ -#include "render/attribute.h" -#include "render/camera.h" -#include "render/curves.h" -#include "render/hair.h" -#include "render/object.h" -#include "render/scene.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 "util/util_color.h" #include "util/util_foreach.h" #include "util/util_hash.h" #include "util/util_logging.h" diff --git a/intern/cycles/blender/blender_display_driver.h b/intern/cycles/blender/blender_display_driver.h index 5e7e9b01065..800d0791041 100644 --- a/intern/cycles/blender/blender_display_driver.h +++ b/intern/cycles/blender/blender_display_driver.h @@ -22,7 +22,7 @@ #include "RNA_blender_cpp.h" -#include "render/display_driver.h" +#include "session/display_driver.h" #include "util/util_thread.h" #include "util/util_unique_ptr.h" diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp index 7b49bb7fbb7..b4b0d04d104 100644 --- a/intern/cycles/blender/blender_geometry.cpp +++ b/intern/cycles/blender/blender_geometry.cpp @@ -15,11 +15,11 @@ * limitations under the License. */ -#include "render/curves.h" -#include "render/hair.h" -#include "render/mesh.h" -#include "render/object.h" -#include "render/volume.h" +#include "scene/curves.h" +#include "scene/hair.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/volume.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/blender_id_map.h index 198cfb4b29a..27a53a90f12 100644 --- a/intern/cycles/blender/blender_id_map.h +++ b/intern/cycles/blender/blender_id_map.h @@ -19,8 +19,8 @@ #include <string.h> -#include "render/geometry.h" -#include "render/scene.h" +#include "scene/geometry.h" +#include "scene/scene.h" #include "util/util_map.h" #include "util/util_set.h" diff --git a/intern/cycles/blender/blender_image.h b/intern/cycles/blender/blender_image.h index fddbbfd9c37..6f1e72c21af 100644 --- a/intern/cycles/blender/blender_image.h +++ b/intern/cycles/blender/blender_image.h @@ -19,7 +19,7 @@ #include "RNA_blender_cpp.h" -#include "render/image.h" +#include "scene/image.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_light.cpp b/intern/cycles/blender/blender_light.cpp index 4df1e720dde..aa0c6a964e4 100644 --- a/intern/cycles/blender/blender_light.cpp +++ b/intern/cycles/blender/blender_light.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "render/light.h" +#include "scene/light.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 7ec430eb7fe..992e17d6f79 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "render/camera.h" -#include "render/colorspace.h" -#include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" +#include "scene/camera.h" +#include "scene/colorspace.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/scene.h" #include "blender/blender_session.h" #include "blender/blender_sync.h" @@ -28,6 +28,7 @@ #include "subd/subd_split.h" #include "util/util_algorithm.h" +#include "util/util_color.h" #include "util/util_disjoint_set.h" #include "util/util_foreach.h" #include "util/util_hash.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 4b1c4edef7e..75311805fd8 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "render/alembic.h" -#include "render/camera.h" -#include "render/graph.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/mesh.h" -#include "render/nodes.h" -#include "render/object.h" -#include "render/particles.h" -#include "render/scene.h" -#include "render/shader.h" +#include "scene/alembic.h" +#include "scene/camera.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/particles.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/shader_graph.h" +#include "scene/shader_nodes.h" #include "blender/blender_object_cull.h" #include "blender/blender_sync.h" diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/blender_object_cull.cpp index cb7827b3c4a..34cceb5a6e4 100644 --- a/intern/cycles/blender/blender_object_cull.cpp +++ b/intern/cycles/blender/blender_object_cull.cpp @@ -16,7 +16,7 @@ #include <cstdlib> -#include "render/camera.h" +#include "scene/camera.h" #include "blender/blender_object_cull.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_output_driver.h b/intern/cycles/blender/blender_output_driver.h index 0852cba1b34..1d016f8bcb9 100644 --- a/intern/cycles/blender/blender_output_driver.h +++ b/intern/cycles/blender/blender_output_driver.h @@ -20,7 +20,7 @@ #include "RNA_blender_cpp.h" -#include "render/output_driver.h" +#include "session/output_driver.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index 206ee24a093..f654998af62 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "render/mesh.h" -#include "render/object.h" -#include "render/particles.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/particles.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index d681517c9e1..45e5394cf34 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -23,8 +23,8 @@ #include @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
