Blender Git Loki
Git Commits -> Revision 4e235c1
Revision 4e235c1 by Brecht Van Lommel (master) April 27, 2011, 14:36 (GMT) |
Blender modifications for Cycles integration. Some notes about code status: * The Blender modifications were fairly quickly put together, much more code polish and work is needed to get this to a state where it can be committed to trunk. Files created with this version may not work in future versions. * Only simple path tracing is supported currently, but we intend to provide finer control, and more options where it makes sense. * For GPU rendering, only CUDA works currently. The intention is to have the same kernel code compile for C++/OpenCL/CUDA, some more work is needed to get OpenCL functional. * There are two shading backends: GPU compatible and Open Shading Language. Unfortunately, OSL only runs on the CPU currently, getting this to run on the GPU would be a major undertaking, and is unlikely to be supported soon. Additionally, it's not possible yet to write custom OSL shaders. * There is some code for adaptive subdivision and displacement, but it's far from finished. The intention is to eventually have a nice unified bump and displacement system. * The code currently has a number of fairly heavy dependencies: Boost, OpenImageIO, GLEW, GLUT, and optionally OSL, Partio. This makes it difficult to compile, we'll try to eliminate some, it may take a while before it becomes easy to compile this. |
Commit Details:
Full Hash: 4e235c184b534d31b651ac0449a1b55a000639fc
SVN Revision: 36355
Parent Commit: da376e0
Lines Changed: +28078, -24186
34 Added Paths:
/source/blender/editors/interface/interface_node.c (+567, -0) (View)
/source/blender/editors/space_node/node_layout.c (+128, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c (+59, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+83, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+62, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+58, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+60, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+59, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+72, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+75, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+74, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+70, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+70, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+72, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+77, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+78, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+74, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+75, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+79, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+76, -0) (View)
/source/blender/editors/space_node/node_layout.c (+128, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c (+59, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+83, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+62, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+65, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+58, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+60, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+59, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+72, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+75, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c (+63, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+74, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+70, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+70, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+72, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+77, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+78, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+64, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+74, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+75, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+79, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+76, -0) (View)
101 Modified Paths:
/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/device/device_network.cpp (+4, -0) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+9, -1) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+7, -22) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+10, -7) (Diff)
/source/blender/blenkernel/BKE_depsgraph.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+41, -3) (Diff)
/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_subsurf.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_world.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+89, -16) (Diff)
/source/blender/blenkernel/intern/material.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/multires.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+183, -70) (Diff)
/source/blender/blenkernel/intern/object.c (+38, -5) (Diff)
/source/blender/blenkernel/intern/scene.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/world.c (+38, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+55, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+12, -0) (Diff)
/source/blender/editors/datafiles/bfont.ttf.c (+5919, -5966) (Diff)
/source/blender/editors/datafiles/bmonofont.ttf.c (+3650, -9666) (Diff)
/source/blender/editors/datafiles/startup.blend.c (+12550, -7298) (Diff)
/source/blender/editors/include/ED_node.h (+8, -3) (Diff)
/source/blender/editors/include/ED_render.h (+2, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+6, -0) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+3, -5) (Diff)
/source/blender/editors/interface/interface_icons.c (+1, -0) (Diff)
/source/blender/editors/interface/interface_intern.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_panel.c (+10, -13) (Diff)
/source/blender/editors/interface/interface_widgets.c (+44, -2) (Diff)
/source/blender/editors/interface/view2d.c (+4, -3) (Diff)
/source/blender/editors/object/object_add.c (+10, -3) (Diff)
/source/blender/editors/render/render_preview.c (+79, -4) (Diff)
/source/blender/editors/render/render_shading.c (+78, -5) (Diff)
/source/blender/editors/screen/area.c (+19, -15) (Diff)
/source/blender/editors/space_buttons/buttons_header.c (+17, -15) (Diff)
/source/blender/editors/space_buttons/buttons_intern.h (+0, -3) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+135, -3) (Diff)
/source/blender/editors/space_node/node_draw.c (+31, -4) (Diff)
/source/blender/editors/space_node/node_edit.c (+111, -21) (Diff)
/source/blender/editors/space_node/node_header.c (+3, -1) (Diff)
/source/blender/editors/space_node/node_intern.h (+3, -0) (Diff)
/source/blender/editors/space_node/node_ops.c (+2, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+18, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+3, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+18, -3) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+38, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_image_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_lamp_types.h (+8, -4) (Diff)
/source/blender/makesdna/DNA_node_types.h (+144, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_world_types.h (+5, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+125, -93) (Diff)
/source/blender/makesrna/intern/rna_access.c (+18, -1) (Diff)
/source/blender/makesrna/intern/rna_animation.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_define.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+11, -1) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_internal_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+20, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_material.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+373, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+35, -2) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_render.c (+73, -6) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+8, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+48, -4) (Diff)
/source/blender/makesrna/intern/rna_ui.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+21, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_world.c (+21, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+740, -754) (Diff)
/source/blender/makesrna/RNA_define.h (+1, -1) (Diff)
/source/blender/makesrna/RNA_types.h (+7, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+4, -4) (Diff)
/source/blender/nodes/CMakeLists.txt (+32, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geom.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c (+0, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_math.c (+2, -2) (Diff)
/source/blender/nodes/SHD_node.h (+38, -19) (Diff)
/source/blender/python/intern/bpy_rna.c (+7, -6) (Diff)
/source/blender/render/CMakeLists.txt (+7, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+13, -5) (Diff)
/source/blender/render/intern/source/pipeline.c (+76, -61) (Diff)
/source/blender/render/SConscript (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+31, -10) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+5, -1) (Diff)
/source/creator/CMakeLists.txt (+13, -0) (Diff)
/intern/cycles/device/device_network.cpp (+4, -0) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+9, -1) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+7, -22) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+10, -7) (Diff)
/source/blender/blenkernel/BKE_depsgraph.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+41, -3) (Diff)
/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_subsurf.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_world.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+89, -16) (Diff)
/source/blender/blenkernel/intern/material.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/mesh.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/multires.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/node.c (+183, -70) (Diff)
/source/blender/blenkernel/intern/object.c (+38, -5) (Diff)
/source/blender/blenkernel/intern/scene.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/world.c (+38, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+55, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+12, -0) (Diff)
/source/blender/editors/datafiles/bfont.ttf.c (+5919, -5966) (Diff)
/source/blender/editors/datafiles/bmonofont.ttf.c (+3650, -9666) (Diff)
/source/blender/editors/datafiles/startup.blend.c (+12550, -7298) (Diff)
/source/blender/editors/include/ED_node.h (+8, -3) (Diff)
/source/blender/editors/include/ED_render.h (+2, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+6, -0) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+3, -5) (Diff)
/source/blender/editors/interface/interface_icons.c (+1, -0) (Diff)
/source/blender/editors/interface/interface_intern.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_panel.c (+10, -13) (Diff)
/source/blender/editors/interface/interface_widgets.c (+44, -2) (Diff)
/source/blender/editors/interface/view2d.c (+4, -3) (Diff)
/source/blender/editors/object/object_add.c (+10, -3) (Diff)
/source/blender/editors/render/render_preview.c (+79, -4) (Diff)
/source/blender/editors/render/render_shading.c (+78, -5) (Diff)
/source/blender/editors/screen/area.c (+19, -15) (Diff)
/source/blender/editors/space_buttons/buttons_header.c (+17, -15) (Diff)
/source/blender/editors/space_buttons/buttons_intern.h (+0, -3) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+135, -3) (Diff)
/source/blender/editors/space_node/node_draw.c (+31, -4) (Diff)
/source/blender/editors/space_node/node_edit.c (+111, -21) (Diff)
/source/blender/editors/space_node/node_header.c (+3, -1) (Diff)
/source/blender/editors/space_node/node_intern.h (+3, -0) (Diff)
/source/blender/editors/space_node/node_ops.c (+2, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+18, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+3, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+18, -3) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+38, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_image_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_lamp_types.h (+8, -4) (Diff)
/source/blender/makesdna/DNA_node_types.h (+144, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+2, -0) (Diff)
/source/blender/makesdna/DNA_world_types.h (+5, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+125, -93) (Diff)
/source/blender/makesrna/intern/rna_access.c (+18, -1) (Diff)
/source/blender/makesrna/intern/rna_animation.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_define.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+11, -1) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_internal_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+20, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_material.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+373, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+35, -2) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+4, -4) (Diff)
/source/blender/makesrna/intern/rna_render.c (+73, -6) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+8, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+48, -4) (Diff)
/source/blender/makesrna/intern/rna_ui.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+21, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_world.c (+21, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+740, -754) (Diff)
/source/blender/makesrna/RNA_define.h (+1, -1) (Diff)
/source/blender/makesrna/RNA_types.h (+7, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+4, -4) (Diff)
/source/blender/nodes/CMakeLists.txt (+32, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geom.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c (+0, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_math.c (+2, -2) (Diff)
/source/blender/nodes/SHD_node.h (+38, -19) (Diff)
/source/blender/python/intern/bpy_rna.c (+7, -6) (Diff)
/source/blender/render/CMakeLists.txt (+7, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+13, -5) (Diff)
/source/blender/render/intern/source/pipeline.c (+76, -61) (Diff)
/source/blender/render/SConscript (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+31, -10) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+5, -1) (Diff)
/source/creator/CMakeLists.txt (+13, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021