[Bf-cycles] old volumetric patch rebased

Kel M kelvinshrek at gmail.com
Wed Dec 21 22:16:31 CET 2011

Apply errors:

patching file intern/cycles/device/device.cpp
patching file intern/cycles/device/device_opencl.cpp
patching file intern/cycles/device/device.h
patching file intern/cycles/device/device_cpu.cpp
patching file intern/cycles/device/device_multi.cpp
patching file intern/cycles/device/device_cuda.cpp
patching file intern/cycles/render/scene.h
patching file intern/cycles/render/shader.cpp
patching file intern/cycles/render/nodes.cpp
patching file intern/cycles/render/integrator.h
Hunk #1 FAILED at 42.
1 out of 1 hunk FAILED -- saving rejects to file
patching file intern/cycles/render/session.cpp
Hunk #1 succeeded at 578 with fuzz 1 (offset -2 lines).
patching file intern/cycles/render/buffers.h
Hunk #1 succeeded at 83 (offset 6 lines).
patching file intern/cycles/render/nodes.h
patching file intern/cycles/render/integrator.cpp
Hunk #1 FAILED at 43.
Hunk #2 FAILED at 83.
Hunk #3 FAILED at 116.
3 out of 3 hunks FAILED -- saving rejects to file
patching file intern/cycles/render/buffers.cpp
patching file intern/cycles/app/cycles_xml.cpp
Hunk #1 FAILED at 258.
Hunk #2 succeeded at 379 (offset -1 lines).
1 out of 2 hunks FAILED -- saving rejects to file
patching file intern/cycles/kernel/kernel_path.h
Hunk #1 succeeded at 234 (offset 3 lines).
Hunk #2 succeeded at 774 (offset 3 lines).
Hunk #3 succeeded at 793 (offset 3 lines).
Hunk #4 succeeded at 834 (offset 3 lines).
Hunk #5 succeeded at 856 (offset 3 lines).
Hunk #6 succeeded at 905 (offset 3 lines).
Hunk #7 succeeded at 927 (offset 3 lines).
Hunk #8 succeeded at 958 (offset 3 lines).
Hunk #9 succeeded at 993 (offset 3 lines).
patching file intern/cycles/kernel/kernel_types.h
Hunk #3 succeeded at 396 with fuzz 2 (offset 4 lines).
patching file intern/cycles/kernel/kernel_light.h
patching file intern/cycles/kernel/svm/svm_closure.h
patching file intern/cycles/kernel/svm/volume.h
patching file intern/cycles/kernel/svm/bsdf_diffuse.h
patching file intern/cycles/kernel/svm/svm_types.h
patching file intern/cycles/kernel/svm/svm_bsdf.h
patching file intern/cycles/kernel/svm/svm.h
patching file intern/cycles/kernel/kernel.h
patching file intern/cycles/kernel/kernel_optimized.cpp
patching file intern/cycles/kernel/kernel_montecarlo.h
patching file intern/cycles/kernel/kernel_shader.h
patching file intern/cycles/kernel/osl/osl_closures.cpp
patching file intern/cycles/kernel/kernel.cpp
patching file intern/cycles/kernel/kernel_random.h
patching file intern/cycles/kernel/kernel_emission.h
patching file intern/cycles/blender/blender_shader.cpp
patching file intern/cycles/blender/addon/properties.py
patching file intern/cycles/blender/addon/ui.py
patching file intern/cycles/blender/addon/presets.py
patching file intern/cycles/blender/blender_sync.cpp
Hunk #1 FAILED at 154.
1 out of 1 hunk FAILED -- saving rejects to file
patching file release/scripts/presets/cycles/integrator/limited_global_illumination.py
patching file release/scripts/presets/cycles/integrator/direct_light.py
patching file release/scripts/presets/cycles/integrator/full_global_illumination.py
patching file source/blender/render/intern/source/pipeline.c
patching file source/blender/blenkernel/BKE_node.h
patching file source/blender/blenkernel/intern/node.c
patching file source/blender/makesrna/intern/rna_nodetree_types.h
patching file source/blender/nodes/shader/nodes/node_shader_volume_bsdf_diffuse.c
patching file source/blender/nodes/NOD_shader.h
patching file source/blender/nodes/CMakeLists.txt

On Wed, Dec 21, 2011 at 8:19 AM, storm <kartochka22 at yandex.ru> wrote:
> Update to reflect recent trunk changes, fixed devices other then cpu
> (maybe it fix windows crash reported). No other changes, still work only
> on CPU, volume marching not work.
> _______________________________________________
> Bf-cycles mailing list
> Bf-cycles at blender.org
> http://lists.blender.org/mailman/listinfo/bf-cycles

More information about the Bf-cycles mailing list