Blender Git Commit Log
Git Commits -> Revision adea12c
Revision adea12c by Brecht Van Lommel (master) September 4, 2012, 13:29 (GMT) |
Cycles: merge of changes from tomato branch. Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering. |
Commit Details:
Full Hash: adea12cb01e4c4f18f345dfbbf49e9e622192e4e
SVN Revision: 50384
Parent Commit: 6856313
Lines Changed: +1978, -703
4 Added Paths:
/intern/cycles/device/device_task.cpp (+113, -0) (View)
/intern/cycles/device/device_task.h (+75, -0) (View)
/intern/cycles/kernel/svm/svm_brick.h (+114, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_tex_brick.c (+90, -0) (View)
/intern/cycles/device/device_task.h (+75, -0) (View)
/intern/cycles/kernel/svm/svm_brick.h (+114, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_tex_brick.c (+90, -0) (View)
65 Modified Paths:
/intern/cycles/app/cycles_test.cpp (+7, -5) (Diff)
/intern/cycles/app/cycles_xml.cpp (+3, -0) (Diff)
/intern/cycles/blender/addon/properties.py (+7, -5) (Diff)
/intern/cycles/blender/addon/ui.py (+11, -2) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+3, -3) (Diff)
/intern/cycles/blender/blender_object.cpp (+9, -5) (Diff)
/intern/cycles/blender/blender_particles.cpp (+1, -2) (Diff)
/intern/cycles/blender/blender_python.cpp (+9, -1) (Diff)
/intern/cycles/blender/blender_session.cpp (+145, -64) (Diff)
/intern/cycles/blender/blender_session.h (+15, -3) (Diff)
/intern/cycles/blender/blender_shader.cpp (+13, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+29, -14) (Diff)
/intern/cycles/blender/blender_sync.h (+5, -16) (Diff)
/intern/cycles/blender/blender_util.h (+11, -5) (Diff)
/intern/cycles/device/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/device/device.cpp (+0, -59) (Diff)
/intern/cycles/device/device.h (+6, -27) (Diff)
/intern/cycles/device/device_cpu.cpp (+49, -20) (Diff)
/intern/cycles/device/device_cuda.cpp (+84, -34) (Diff)
/intern/cycles/device/device_multi.cpp (+26, -1) (Diff)
/intern/cycles/device/device_opencl.cpp (+57, -25) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/kernel.cpp (+6, -104) (Diff)
/intern/cycles/kernel/kernel_compat_cpu.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_globals.h (+6, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_textures.h (+12, -12) (Diff)
/intern/cycles/kernel/svm/svm.h (+7, -0) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+118, -28) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+3, -1) (Diff)
/intern/cycles/render/buffers.cpp (+24, -1) (Diff)
/intern/cycles/render/buffers.h (+24, -5) (Diff)
/intern/cycles/render/camera.cpp (+11, -1) (Diff)
/intern/cycles/render/camera.h (+1, -0) (Diff)
/intern/cycles/render/graph.cpp (+14, -0) (Diff)
/intern/cycles/render/image.cpp (+43, -32) (Diff)
/intern/cycles/render/image.h (+11, -2) (Diff)
/intern/cycles/render/nodes.cpp (+126, -9) (Diff)
/intern/cycles/render/nodes.h (+11, -0) (Diff)
/intern/cycles/render/scene.cpp (+4, -1) (Diff)
/intern/cycles/render/scene.h (+4, -3) (Diff)
/intern/cycles/render/session.cpp (+170, -50) (Diff)
/intern/cycles/render/session.h (+19, -8) (Diff)
/intern/cycles/render/tile.cpp (+106, -32) (Diff)
/intern/cycles/render/tile.h (+20, -8) (Diff)
/intern/cycles/util/util_math.h (+5, -0) (Diff)
/intern/cycles/util/util_progress.h (+34, -11) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+20, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+10, -2) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+6, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+16, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+55, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+15, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+7, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -1) (Diff)
/source/blender/render/intern/include/initrender.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_result.h (+5, -3) (Diff)
/source/blender/render/intern/source/external_engine.c (+56, -12) (Diff)
/source/blender/render/intern/source/initrender.c (+2, -2) (Diff)
/source/blender/render/intern/source/pipeline.c (+14, -14) (Diff)
/source/blender/render/intern/source/render_result.c (+97, -62) (Diff)
/intern/cycles/app/cycles_xml.cpp (+3, -0) (Diff)
/intern/cycles/blender/addon/properties.py (+7, -5) (Diff)
/intern/cycles/blender/addon/ui.py (+11, -2) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+3, -3) (Diff)
/intern/cycles/blender/blender_object.cpp (+9, -5) (Diff)
/intern/cycles/blender/blender_particles.cpp (+1, -2) (Diff)
/intern/cycles/blender/blender_python.cpp (+9, -1) (Diff)
/intern/cycles/blender/blender_session.cpp (+145, -64) (Diff)
/intern/cycles/blender/blender_session.h (+15, -3) (Diff)
/intern/cycles/blender/blender_shader.cpp (+13, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+29, -14) (Diff)
/intern/cycles/blender/blender_sync.h (+5, -16) (Diff)
/intern/cycles/blender/blender_util.h (+11, -5) (Diff)
/intern/cycles/device/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/device/device.cpp (+0, -59) (Diff)
/intern/cycles/device/device.h (+6, -27) (Diff)
/intern/cycles/device/device_cpu.cpp (+49, -20) (Diff)
/intern/cycles/device/device_cuda.cpp (+84, -34) (Diff)
/intern/cycles/device/device_multi.cpp (+26, -1) (Diff)
/intern/cycles/device/device_opencl.cpp (+57, -25) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/kernel.cpp (+6, -104) (Diff)
/intern/cycles/kernel/kernel_compat_cpu.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_globals.h (+6, -1) (Diff)
/intern/cycles/kernel/kernel_path.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_textures.h (+12, -12) (Diff)
/intern/cycles/kernel/svm/svm.h (+7, -0) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+118, -28) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+3, -1) (Diff)
/intern/cycles/render/buffers.cpp (+24, -1) (Diff)
/intern/cycles/render/buffers.h (+24, -5) (Diff)
/intern/cycles/render/camera.cpp (+11, -1) (Diff)
/intern/cycles/render/camera.h (+1, -0) (Diff)
/intern/cycles/render/graph.cpp (+14, -0) (Diff)
/intern/cycles/render/image.cpp (+43, -32) (Diff)
/intern/cycles/render/image.h (+11, -2) (Diff)
/intern/cycles/render/nodes.cpp (+126, -9) (Diff)
/intern/cycles/render/nodes.h (+11, -0) (Diff)
/intern/cycles/render/scene.cpp (+4, -1) (Diff)
/intern/cycles/render/scene.h (+4, -3) (Diff)
/intern/cycles/render/session.cpp (+170, -50) (Diff)
/intern/cycles/render/session.h (+19, -8) (Diff)
/intern/cycles/render/tile.cpp (+106, -32) (Diff)
/intern/cycles/render/tile.h (+20, -8) (Diff)
/intern/cycles/util/util_math.h (+5, -0) (Diff)
/intern/cycles/util/util_progress.h (+34, -11) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+20, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+10, -2) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+6, -0) (Diff)
/source/blender/makesdna/DNA_node_types.h (+16, -2) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+55, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_render.c (+15, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/render/extern/include/RE_engine.h (+7, -2) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+4, -1) (Diff)
/source/blender/render/intern/include/initrender.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_result.h (+5, -3) (Diff)
/source/blender/render/intern/source/external_engine.c (+56, -12) (Diff)
/source/blender/render/intern/source/initrender.c (+2, -2) (Diff)
/source/blender/render/intern/source/pipeline.c (+14, -14) (Diff)
/source/blender/render/intern/source/render_result.c (+97, -62) (Diff)
Master Commits
MiikaHweb | 2003-2021