[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55780] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55700:55776
Campbell Barton
ideasman42 at gmail.com
Thu Apr 4 15:37:08 CEST 2013
Revision: 55780
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55780
Author: campbellbarton
Date: 2013-04-04 13:37:07 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55700:55776
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55700
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/render/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/film.h
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowNULL.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/opencolorio/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/opencolorio/SConscript
branches/soc-2008-mxcurioni/intern/opencolorio/fallback_impl.cc
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.cc
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.h
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl.cc
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl.h
branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2008-mxcurioni/intern/tools/dump_rna2xml.py
branches/soc-2008-mxcurioni/release/datafiles/colormanagement/config.ocio
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_smoke.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/depsgraph_private.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_space_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/rigidbody_object.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_relationships.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/util/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_static_types.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bssrdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_bssrdf.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_bssrdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2008-mxcurioni/intern/cycles/render/bssrdf.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/bssrdf.h
branches/soc-2008-mxcurioni/intern/cycles/render/tables.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tables.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/render/filter.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/filter.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55700
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55776
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2013-04-04 13:37:07 UTC (rev 55780)
@@ -1292,18 +1292,14 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
- ${OPENCOLLADA}/include/COLLADAStreamWriter
- ${OPENCOLLADA}/include/COLLADABaseUtils
- ${OPENCOLLADA}/include/COLLADAFramework
- ${OPENCOLLADA}/include/COLLADASaxFrameworkLoader
- ${OPENCOLLADA}/include/GeneratedSaxParser
+ ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+ ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+ ${OPENCOLLADA}/include/opencollada/COLLADAFramework
+ ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+ ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
- if(WITH_MINGW64)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
- else()
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
- endif()
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
set(PCRE_LIBRARIES pcre)
endif()
@@ -1416,8 +1412,8 @@
LLVMX86Disassembler LLVMX86Info
LLVMX86Utils LLVMipa
LLVMipo LLVMCore)
- #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
+ #imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
set(LLVM_STATIC YES)
endif()
Modified: branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-04-04 13:37:07 UTC (rev 55780)
@@ -88,7 +88,7 @@
}
}
else
- memcpy(((data_t*)buffer.getBuffer()) + buf_pos, frame->data[1], data_size);
+ memcpy(((data_t*)buffer.getBuffer()) + buf_pos, frame->data[0], data_size);
buf_pos += data_size;
}
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py 2013-04-04 13:37:07 UTC (rev 55780)
@@ -205,6 +205,13 @@
default=1,
)
+ cls.subsurface_samples = IntProperty(
+ name="Subsurface Samples",
+ description="Number of subsurface scattering samples to render for each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+
cls.no_caustics = BoolProperty(
name="No Caustics",
description="Leave out caustics, resulting in a darker image with less noise",
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py 2013-04-04 13:37:07 UTC (rev 55780)
@@ -83,6 +83,7 @@
sub.prop(cscene, "transmission_samples", text="Transmission")
sub.prop(cscene, "ao_samples", text="AO")
sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
+ sub.prop(cscene, "subsurface_samples", text="Subsurface")
class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp 2013-04-04 13:37:07 UTC (rev 55780)
@@ -252,7 +252,6 @@
else if (b_node.is_a(&RNA_ShaderNodeNormal)) {
BL::Node::outputs_iterator out_it;
b_node.outputs.begin(out_it);
- BL::NodeSocket vec_sock(*out_it);
NormalNode *norm = new NormalNode();
norm->direction = get_node_output_vector(b_node, "Normal");
@@ -302,6 +301,9 @@
else if (b_node.is_a(&RNA_ShaderNodeBsdfDiffuse)) {
node = new DiffuseBsdfNode();
}
+ else if (b_node.is_a(&RNA_ShaderNodeSubsurfaceScattering)) {
+ node = new SubsurfaceScatteringNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeBsdfGlossy)) {
BL::ShaderNodeBsdfGlossy b_glossy_node(b_node);
GlossyBsdfNode *glossy = new GlossyBsdfNode();
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp 2013-04-04 13:37:07 UTC (rev 55780)
@@ -19,7 +19,6 @@
#include "background.h"
#include "camera.h"
#include "film.h"
-#include "../render/filter.h"
#include "graph.h"
#include "integrator.h"
#include "light.h"
@@ -197,6 +196,7 @@
integrator->transmission_samples = get_int(cscene, "transmission_samples");
integrator->ao_samples = get_int(cscene, "ao_samples");
integrator->mesh_light_samples = get_int(cscene, "mesh_light_samples");
+ integrator->subsurface_samples = get_int(cscene, "subsurface_samples");
integrator->progressive = get_boolean(cscene, "progressive");
if(integrator->modified(previntegrator))
@@ -213,18 +213,11 @@
Film prevfilm = *film;
film->exposure = get_float(cscene, "film_exposure");
+ film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
+ film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
if(film->modified(prevfilm))
film->tag_update(scene);
-
- Filter *filter = scene->filter;
- Filter prevfilter = *filter;
-
- filter->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
- filter->filter_width = (filter->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
-
- if(filter->modified(prevfilter))
- filter->tag_update(scene);
}
/* Render Layer */
Modified: branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h 2013-04-04 13:37:07 UTC (rev 55780)
@@ -216,6 +216,14 @@
return mem;
}
+ void copy_at(T *ptr, size_t offset, size_t size)
+ {
+ if(size > 0) {
+ size_t mem_size = size*data_elements*datatype_size(data_type);
+ memcpy(&data[0] + offset, ptr, mem_size);
+ }
+ }
+
void reference(T *ptr, size_t width, size_t height = 0)
{
data.clear();
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt 2013-04-04 13:37:07 UTC (rev 55780)
@@ -42,6 +42,7 @@
kernel_projection.h
kernel_random.h
kernel_shader.h
+ kernel_subsurface.h
kernel_textures.h
kernel_triangle.h
kernel_types.h
@@ -62,6 +63,7 @@
closure/bsdf_util.h
closure/bsdf_ward.h
closure/bsdf_westin.h
+ closure/bssrdf.h
closure/emissive.h
closure/volume.h
)
Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf.h 2013-04-04 12:26:31 UTC (rev 55779)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/closure/bsdf.h 2013-04-04 13:37:07 UTC (rev 55780)
@@ -29,6 +29,7 @@
#include "../closure/bsdf_ward.h"
#endif
#include "../closure/bsdf_westin.h"
+#include "../closure/bssrdf.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list