Blender Git Loki
Git Commits -> Revision 9a3282c
Revision 9a3282c by Brecht Van Lommel (render25) January 22, 2010, 16:17 (GMT) |
Render Branch Some refactoring of blender rendering code, various code changes to clean up the code and make it easier to extend and fit in the new shading system. This also deprecates a number of features, so breaks backwards compatibility already. No new shading system or new features in this commit. Also, don't report bugs or problems for this branch yet. Deprecated features: * World exposure/range. * Backbuf image. * Specular transparency. * Energy Ramps. * Jittered sampling for AO and Area lamps. * Warping and stencils in the texture stack. * Sticky texture coordinates. Code changes: * Many file and function renames, splitting, keeping the working of the code intact but making the existing structure more clear. * Render global R replaced by local variables. * Shading and pass combining for solid and z-transp is now unified. * Render and ShadeInput structs have been split up into nested structs. * Threaded render no longer uses sleep(). * Lamp shading loop has been reorganized. This will make some renders look different, some due to bugs being fixed, and some due to new bugs. * Texture nodes are now a texture type rather using the "use nodes" button. More details on second part of this page: http://wiki.blender.org/index.php/BlenderDev/ShadingSystem/Notes |
Commit Details:
Full Hash: 9a3282cd39d7d9ac6f871b63ae5ddfd75a15bbd2
SVN Revision: 26196
Parent Commit: 2eb2b8c
Lines Changed: +32918, -32853
44 Added Paths:
/source/blender/render/intern/include/camera.h (+91, -0) (View)
/source/blender/render/intern/include/database.h (+46, -0) (View)
/source/blender/render/intern/include/diskocclusion.h (+50, -0) (View)
/source/blender/render/intern/include/environment.h (+62, -0) (View)
/source/blender/render/intern/include/lamp.h (+172, -0) (View)
/source/blender/render/intern/include/material.h (+68, -0) (View)
/source/blender/render/intern/include/object.h (+155, -0) (View)
/source/blender/render/intern/include/object_halo.h (+80, -0) (View)
/source/blender/render/intern/include/object_mesh.h (+124, -0) (View)
/source/blender/render/intern/include/object_strand.h (+180, -0) (View)
/source/blender/render/intern/include/part.h (+81, -0) (View)
/source/blender/render/intern/include/pixelfilter.h (+71, -0) (View)
/source/blender/render/intern/include/raytrace.h (+31, -0) (View)
/source/blender/render/intern/include/result.h (+103, -0) (View)
/source/blender/render/intern/include/sampler.h (+58, -0) (View)
/source/blender/render/intern/include/shadowbuf.h (+75, -0) (View)
/source/blender/render/intern/include/texture_stack.h (+58, -0) (View)
/source/blender/render/intern/raytrace/rayobject_blibvh.cpp (+169, -0) (View)
/source/blender/render/intern/raytrace/rayobject_instance.cpp (+200, -0) (View)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+1080, -0) (View)
/source/blender/render/intern/raytrace/rayobject_raycounter.cpp (+87, -0) (View)
/source/blender/render/intern/source/bake.c (+825, -0) (View)
/source/blender/render/intern/source/camera.c (+536, -0) (View)
/source/blender/render/intern/source/database.c (+125, -0) (View)
/source/blender/render/intern/source/diskocclusion.c (+1860, -0) (View)
/source/blender/render/intern/source/environment.c (+365, -0) (View)
/source/blender/render/intern/source/halo.c (+498, -0) (View)
/source/blender/render/intern/source/lamp.c (+1068, -0) (View)
/source/blender/render/intern/source/material.c (+644, -0) (View)
/source/blender/render/intern/source/object.c (+365, -0) (View)
/source/blender/render/intern/source/object_halo.c (+838, -0) (View)
/source/blender/render/intern/source/object_mesh.c (+3717, -0) (View)
/source/blender/render/intern/source/object_strand.c (+1130, -0) (View)
/source/blender/render/intern/source/part.c (+230, -0) (View)
/source/blender/render/intern/source/pixelfilter.c (+711, -0) (View)
/source/blender/render/intern/source/result.c (+1542, -0) (View)
/source/blender/render/intern/source/sampler.c (+299, -0) (View)
/source/blender/render/intern/source/shadowbuf.c (+2787, -0) (View)
/source/blender/render/intern/source/texture_envmap.c (+772, -0) (View)
/source/blender/render/intern/source/texture_image.c (+1879, -0) (View)
/source/blender/render/intern/source/texture_pointdensity.c (+478, -0) (View)
/source/blender/render/intern/source/texture_stack.c (+2239, -0) (View)
/source/blender/render/intern/source/texture_voxeldata.c (+322, -0) (View)
/source/blender/render/intern/source/vblur.c (+594, -0) (View)
/source/blender/render/intern/include/database.h (+46, -0) (View)
/source/blender/render/intern/include/diskocclusion.h (+50, -0) (View)
/source/blender/render/intern/include/environment.h (+62, -0) (View)
/source/blender/render/intern/include/lamp.h (+172, -0) (View)
/source/blender/render/intern/include/material.h (+68, -0) (View)
/source/blender/render/intern/include/object.h (+155, -0) (View)
/source/blender/render/intern/include/object_halo.h (+80, -0) (View)
/source/blender/render/intern/include/object_mesh.h (+124, -0) (View)
/source/blender/render/intern/include/object_strand.h (+180, -0) (View)
/source/blender/render/intern/include/part.h (+81, -0) (View)
/source/blender/render/intern/include/pixelfilter.h (+71, -0) (View)
/source/blender/render/intern/include/raytrace.h (+31, -0) (View)
/source/blender/render/intern/include/result.h (+103, -0) (View)
/source/blender/render/intern/include/sampler.h (+58, -0) (View)
/source/blender/render/intern/include/shadowbuf.h (+75, -0) (View)
/source/blender/render/intern/include/texture_stack.h (+58, -0) (View)
/source/blender/render/intern/raytrace/rayobject_blibvh.cpp (+169, -0) (View)
/source/blender/render/intern/raytrace/rayobject_instance.cpp (+200, -0) (View)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+1080, -0) (View)
/source/blender/render/intern/raytrace/rayobject_raycounter.cpp (+87, -0) (View)
/source/blender/render/intern/source/bake.c (+825, -0) (View)
/source/blender/render/intern/source/camera.c (+536, -0) (View)
/source/blender/render/intern/source/database.c (+125, -0) (View)
/source/blender/render/intern/source/diskocclusion.c (+1860, -0) (View)
/source/blender/render/intern/source/environment.c (+365, -0) (View)
/source/blender/render/intern/source/halo.c (+498, -0) (View)
/source/blender/render/intern/source/lamp.c (+1068, -0) (View)
/source/blender/render/intern/source/material.c (+644, -0) (View)
/source/blender/render/intern/source/object.c (+365, -0) (View)
/source/blender/render/intern/source/object_halo.c (+838, -0) (View)
/source/blender/render/intern/source/object_mesh.c (+3717, -0) (View)
/source/blender/render/intern/source/object_strand.c (+1130, -0) (View)
/source/blender/render/intern/source/part.c (+230, -0) (View)
/source/blender/render/intern/source/pixelfilter.c (+711, -0) (View)
/source/blender/render/intern/source/result.c (+1542, -0) (View)
/source/blender/render/intern/source/sampler.c (+299, -0) (View)
/source/blender/render/intern/source/shadowbuf.c (+2787, -0) (View)
/source/blender/render/intern/source/texture_envmap.c (+772, -0) (View)
/source/blender/render/intern/source/texture_image.c (+1879, -0) (View)
/source/blender/render/intern/source/texture_pointdensity.c (+478, -0) (View)
/source/blender/render/intern/source/texture_stack.c (+2239, -0) (View)
/source/blender/render/intern/source/texture_voxeldata.c (+322, -0) (View)
/source/blender/render/intern/source/vblur.c (+594, -0) (View)
23 Deleted Paths:
/source/blender/render/intern/include/gammaCorrectionTables.h (+0, -51)
/source/blender/render/intern/include/initrender.h (+0, -49)
/source/blender/render/intern/include/pixelblending.h (+0, -70)
/source/blender/render/intern/include/pixelshading.h (+0, -63)
/source/blender/render/intern/include/renderdatabase.h (+0, -144)
/source/blender/render/intern/include/renderpipeline.h (+0, -43)
/source/blender/render/intern/include/shadbuf.h (+0, -114)
/source/blender/render/intern/source/envmap.c (+0, -750)
/source/blender/render/intern/source/gammaCorrectionTables.c (+0, -145)
/source/blender/render/intern/source/imagetexture.c (+0, -1888)
/source/blender/render/intern/source/initrender.c (+0, -684)
/source/blender/render/intern/source/occlusion.c (+0, -1862)
/source/blender/render/intern/source/pixelblending.c (+0, -395)
/source/blender/render/intern/source/pixelshading.c (+0, -676)
/source/blender/render/intern/source/pointdensity.c (+0, -482)
/source/blender/render/intern/source/rayobject_blibvh.c (+0, -169)
/source/blender/render/intern/source/rayobject_instance.c (+0, -200)
/source/blender/render/intern/source/rayobject_octree.c (+0, -1080)
/source/blender/render/intern/source/rayobject_raycounter.c (+0, -87)
/source/blender/render/intern/source/renderdatabase.c (+0, -1429)
/source/blender/render/intern/source/shadbuf.c (+0, -2626)
/source/blender/render/intern/source/strand.c (+0, -1017)
/source/blender/render/intern/source/voxeldata.c (+0, -339)
/source/blender/render/intern/include/initrender.h (+0, -49)
/source/blender/render/intern/include/pixelblending.h (+0, -70)
/source/blender/render/intern/include/pixelshading.h (+0, -63)
/source/blender/render/intern/include/renderdatabase.h (+0, -144)
/source/blender/render/intern/include/renderpipeline.h (+0, -43)
/source/blender/render/intern/include/shadbuf.h (+0, -114)
/source/blender/render/intern/source/envmap.c (+0, -750)
/source/blender/render/intern/source/gammaCorrectionTables.c (+0, -145)
/source/blender/render/intern/source/imagetexture.c (+0, -1888)
/source/blender/render/intern/source/initrender.c (+0, -684)
/source/blender/render/intern/source/occlusion.c (+0, -1862)
/source/blender/render/intern/source/pixelblending.c (+0, -395)
/source/blender/render/intern/source/pixelshading.c (+0, -676)
/source/blender/render/intern/source/pointdensity.c (+0, -482)
/source/blender/render/intern/source/rayobject_blibvh.c (+0, -169)
/source/blender/render/intern/source/rayobject_instance.c (+0, -200)
/source/blender/render/intern/source/rayobject_octree.c (+0, -1080)
/source/blender/render/intern/source/rayobject_raycounter.c (+0, -87)
/source/blender/render/intern/source/renderdatabase.c (+0, -1429)
/source/blender/render/intern/source/shadbuf.c (+0, -2626)
/source/blender/render/intern/source/strand.c (+0, -1017)
/source/blender/render/intern/source/voxeldata.c (+0, -339)
76 Modified Paths:
/release/scripts/ui/properties_data_lamp.py (+0, -7) (Diff)
/release/scripts/ui/properties_texture.py (+8, -4) (Diff)
/release/scripts/ui/properties_world.py (+1, -3) (Diff)
/release/scripts/ui/space_node.py (+0, -2) (Diff)
/source/blender/blenkernel/BKE_material.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_node.h (+8, -7) (Diff)
/source/blender/blenkernel/intern/displist.c (+57, -50) (Diff)
/source/blender/blenkernel/intern/library.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+30, -27) (Diff)
/source/blender/blenkernel/intern/node.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/world.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_kdopbvh.h (+7, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+29, -10) (Diff)
/source/blender/editors/mesh/mesh_data.c (+0, -69) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+0, -2) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+0, -2) (Diff)
/source/blender/editors/object/object_bake.c (+1, -1) (Diff)
/source/blender/editors/render/render_preview.c (+10, -15) (Diff)
/source/blender/editors/screen/screen_edit.c (+1, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+1, -1) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+2, -22) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+0, -5) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+1003, -1008) (Diff)
/source/blender/makesdna/DNA_lamp_types.h (+7, -7) (Diff)
/source/blender/makesdna/DNA_material_types.h (+2, -3) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+15, -14) (Diff)
/source/blender/makesdna/DNA_world_types.h (+5, -10) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+1, -22) (Diff)
/source/blender/makesrna/intern/rna_material.c (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_render.c (+7, -7) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+28, -30) (Diff)
/source/blender/makesrna/intern/rna_world.c (+0, -20) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_blur.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_camera.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geom.c (+23, -21) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+29, -28) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_texture.c (+6, -6) (Diff)
/source/blender/nodes/intern/SHD_util.c (+4, -3) (Diff)
/source/blender/nodes/intern/SHD_util.h (+1, -1) (Diff)
/source/blender/nodes/intern/TEX_util.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+6, -3) (Diff)
/source/blender/render/extern/include/RE_render_ext.h (+0, -6) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+107, -83) (Diff)
/source/blender/render/intern/include/envmap.h (+18, -13) (Diff)
/source/blender/render/intern/include/occlusion.h (+1, -1) (Diff)
/source/blender/render/intern/include/pointdensity.h (+13, -7) (Diff)
/source/blender/render/intern/include/rendercore.h (+39, -62) (Diff)
/source/blender/render/intern/include/render_types.h (+102, -507) (Diff)
/source/blender/render/intern/include/shading.h (+69, -42) (Diff)
/source/blender/render/intern/include/sss.h (+19, -13) (Diff)
/source/blender/render/intern/include/strand.h (+1, -1) (Diff)
/source/blender/render/intern/include/sunsky.h (+7, -5) (Diff)
/source/blender/render/intern/include/texture.h (+38, -32) (Diff)
/source/blender/render/intern/include/volumetric.h (+32, -11) (Diff)
/source/blender/render/intern/include/volume_precache.h (+26, -10) (Diff)
/source/blender/render/intern/include/voxeldata.h (+7, -14) (Diff)
/source/blender/render/intern/include/zbuf.h (+66, -68) (Diff)
/source/blender/render/intern/raytrace/rayobject.cpp (+3, -3) (Diff)
/source/blender/render/intern/source/convertblender.c (+387, -4460) (Diff)
/source/blender/render/intern/source/pipeline.c (+403, -1628) (Diff)
/source/blender/render/intern/source/rayshade.c (+362, -1123) (Diff)
/source/blender/render/intern/source/rendercore.c (+530, -2006) (Diff)
/source/blender/render/intern/source/shadeinput.c (+987, -935) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+396, -1597) (Diff)
/source/blender/render/intern/source/sss.c (+58, -59) (Diff)
/source/blender/render/intern/source/sunsky.c (+93, -90) (Diff)
/source/blender/render/intern/source/texture.c (+354, -2443) (Diff)
/source/blender/render/intern/source/volumetric.c (+161, -165) (Diff)
/source/blender/render/intern/source/volume_precache.c (+72, -58) (Diff)
/source/blender/render/intern/source/zbuf.c (+386, -1610) (Diff)
/release/scripts/ui/properties_texture.py (+8, -4) (Diff)
/release/scripts/ui/properties_world.py (+1, -3) (Diff)
/release/scripts/ui/space_node.py (+0, -2) (Diff)
/source/blender/blenkernel/BKE_material.h (+2, -2) (Diff)
/source/blender/blenkernel/BKE_node.h (+8, -7) (Diff)
/source/blender/blenkernel/intern/displist.c (+57, -50) (Diff)
/source/blender/blenkernel/intern/library.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+30, -27) (Diff)
/source/blender/blenkernel/intern/node.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/world.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_kdopbvh.h (+7, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+29, -10) (Diff)
/source/blender/editors/mesh/mesh_data.c (+0, -69) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+0, -2) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+0, -2) (Diff)
/source/blender/editors/object/object_bake.c (+1, -1) (Diff)
/source/blender/editors/render/render_preview.c (+10, -15) (Diff)
/source/blender/editors/screen/screen_edit.c (+1, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+1, -1) (Diff)
/source/blender/gpu/CMakeLists.txt (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+2, -22) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+0, -5) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+1003, -1008) (Diff)
/source/blender/makesdna/DNA_lamp_types.h (+7, -7) (Diff)
/source/blender/makesdna/DNA_material_types.h (+2, -3) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+15, -14) (Diff)
/source/blender/makesdna/DNA_world_types.h (+5, -10) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+1, -22) (Diff)
/source/blender/makesrna/intern/rna_material.c (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_object.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_render.c (+7, -7) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+28, -30) (Diff)
/source/blender/makesrna/intern/rna_world.c (+0, -20) (Diff)
/source/blender/nodes/intern/CMP_nodes/CMP_blur.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_camera.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geom.c (+23, -21) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+29, -28) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output.c (+3, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_texture.c (+6, -6) (Diff)
/source/blender/nodes/intern/SHD_util.c (+4, -3) (Diff)
/source/blender/nodes/intern/SHD_util.h (+1, -1) (Diff)
/source/blender/nodes/intern/TEX_util.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+6, -3) (Diff)
/source/blender/render/extern/include/RE_render_ext.h (+0, -6) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+107, -83) (Diff)
/source/blender/render/intern/include/envmap.h (+18, -13) (Diff)
/source/blender/render/intern/include/occlusion.h (+1, -1) (Diff)
/source/blender/render/intern/include/pointdensity.h (+13, -7) (Diff)
/source/blender/render/intern/include/rendercore.h (+39, -62) (Diff)
/source/blender/render/intern/include/render_types.h (+102, -507) (Diff)
/source/blender/render/intern/include/shading.h (+69, -42) (Diff)
/source/blender/render/intern/include/sss.h (+19, -13) (Diff)
/source/blender/render/intern/include/strand.h (+1, -1) (Diff)
/source/blender/render/intern/include/sunsky.h (+7, -5) (Diff)
/source/blender/render/intern/include/texture.h (+38, -32) (Diff)
/source/blender/render/intern/include/volumetric.h (+32, -11) (Diff)
/source/blender/render/intern/include/volume_precache.h (+26, -10) (Diff)
/source/blender/render/intern/include/voxeldata.h (+7, -14) (Diff)
/source/blender/render/intern/include/zbuf.h (+66, -68) (Diff)
/source/blender/render/intern/raytrace/rayobject.cpp (+3, -3) (Diff)
/source/blender/render/intern/source/convertblender.c (+387, -4460) (Diff)
/source/blender/render/intern/source/pipeline.c (+403, -1628) (Diff)
/source/blender/render/intern/source/rayshade.c (+362, -1123) (Diff)
/source/blender/render/intern/source/rendercore.c (+530, -2006) (Diff)
/source/blender/render/intern/source/shadeinput.c (+987, -935) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+396, -1597) (Diff)
/source/blender/render/intern/source/sss.c (+58, -59) (Diff)
/source/blender/render/intern/source/sunsky.c (+93, -90) (Diff)
/source/blender/render/intern/source/texture.c (+354, -2443) (Diff)
/source/blender/render/intern/source/volumetric.c (+161, -165) (Diff)
/source/blender/render/intern/source/volume_precache.c (+72, -58) (Diff)
/source/blender/render/intern/source/zbuf.c (+386, -1610) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021