[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50376] branches/soc-2011-tomato: Merging r50265 through r50373 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Sep 4 11:06:38 CEST 2012
Revision: 50376
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50376
Author: nazgul
Date: 2012-09-04 09:06:37 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Merging r50265 through r50373 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50265
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50373
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.h
branches/soc-2011-tomato/intern/cycles/blender/blender_util.h
branches/soc-2011-tomato/intern/cycles/cmake/external_libs.cmake
branches/soc-2011-tomato/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_object.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_triangle.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_math.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/render/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/intern/cycles/render/graph.h
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.h
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/cycles/render/object.h
branches/soc-2011-tomato/intern/cycles/render/osl.cpp
branches/soc-2011-tomato/intern/cycles/render/scene.cpp
branches/soc-2011-tomato/intern/cycles/render/scene.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/guardedalloc/intern/mmap_win.c
branches/soc-2011-tomato/intern/opennl/intern/opennl.c
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_evaluate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sca.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_fileops.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/runtime.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_deps.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/editors/util/ed_util.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/GPU_buffers.h
branches/soc-2011-tomato/source/blender/gpu/GPU_draw.h
branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
branches/soc-2011-tomato/source/blender/gpu/GPU_material.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-tomato/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-tomato/source/blender/imbuf/intern/bmp.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-tomato/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-tomato/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2011-tomato/source/blender/render/intern/include/pixelshading.h
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/render/intern/source/texture_ocean.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_keymap.h
branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.h
Added Paths:
-----------
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/oslutil.h
branches/soc-2011-tomato/intern/cycles/render/particles.cpp
branches/soc-2011-tomato/intern/cycles/render/particles.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_endian_switch_inline.h
branches/soc-2011-tomato/source/blender/blenlib/intern/endian_switch.c
branches/soc-2011-tomato/source/blender/blenloader/BLO_blend_defs.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonMain.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonMain.h
Removed Paths:
-------------
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50264
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50373
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-mingw-config.py 2012-09-04 09:06:37 UTC (rev 50376)
@@ -178,7 +178,7 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
##
CC = 'gcc'
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-09-04 09:06:37 UTC (rev 50376)
@@ -151,7 +151,7 @@
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-09-04 09:06:37 UTC (rev 50376)
@@ -849,7 +849,7 @@
elif value_type in (bool, int, float, str, tuple):
# constant, not much fun we can do here except to list it.
# TODO, figure out some way to document these!
- #fw(".. data:: %s\n\n" % attribute)
+ fw(".. data:: %s\n\n" % attribute)
write_indented_lines(" ", fw, "constant value %s" % repr(value), False)
fw("\n")
else:
Modified: branches/soc-2011-tomato/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/cycles/CMakeLists.txt 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/intern/cycles/CMakeLists.txt 2012-09-04 09:06:37 UTC (rev 50376)
@@ -20,8 +20,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
-# for OSL, not needed yet
-# set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+# for OSL
+set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
# set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
# Definitions and Includes
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-09-04 09:06:37 UTC (rev 50376)
@@ -487,6 +487,7 @@
else if(string_iequals(node.name(), "mix")) {
MixNode *mix = new MixNode();
xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
+ xml_read_bool(&mix->use_clamp, node, "use_clamp");
snode = mix;
}
else if(string_iequals(node.name(), "gamma")) {
@@ -518,6 +519,7 @@
else if(string_iequals(node.name(), "math")) {
MathNode *math = new MathNode();
xml_read_enum(&math->type, MathNode::type_enum, node, "type");
+ xml_read_bool(&math->use_clamp, node, "use_clamp");
snode = math;
}
else if(string_iequals(node.name(), "vector_math")) {
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-09-04 09:06:37 UTC (rev 50376)
@@ -927,6 +927,9 @@
layout.prop(cscene, "device")
elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
layout.prop(cscene, "device")
+
+ if cscene.feature_set == 'EXPERIMENTAL' and cscene.device == 'CPU' and engine.with_osl():
+ layout.prop(cscene, "shading_system")
def draw_pause(self, context):
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp 2012-09-04 09:06:37 UTC (rev 50376)
@@ -247,11 +247,10 @@
scene->object_manager->tag_update(scene);
}
- /* updated dupli objects require particle sync */
- bool need_particle_update = object_need_particle_update(b_ob);
-
/* object sync */
- if(object_updated || (object->mesh && object->mesh->need_update) || need_particle_update) {
+ /* transform comparison should not be needed, but duplis don't work perfect
+ * in the depsgraph and may not signal changes, so this is a workaround */
+ if(object_updated || (object->mesh && object->mesh->need_update) || tfm != object->tfm) {
object->name = b_ob.name().c_str();
object->pass_id = b_ob.pass_index();
object->tfm = tfm;
@@ -277,10 +276,6 @@
object->particle_id = particle_id;
- /* particle sync */
- if (need_particle_update)
- sync_particles(object, b_ob);
-
object->tag_update(scene);
}
}
@@ -303,7 +298,7 @@
/* object loop */
BL::Scene::objects_iterator b_ob;
BL::Scene b_sce = b_scene;
- int particle_offset = 0;
+ int particle_offset = 1; /* first particle is dummy for regular, non-instanced objects */
bool cancel = false;
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp 2012-09-04 08:53:47 UTC (rev 50375)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_particles.cpp 2012-09-04 09:06:37 UTC (rev 50376)
@@ -16,9 +16,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "object.h"
+#include "mesh.h"
+#include "particles.h"
-#include "mesh.h"
#include "blender_sync.h"
#include "blender_util.h"
@@ -31,7 +31,7 @@
/* Particles Sync */
-bool BlenderSync::object_need_particle_update(BL::Object b_ob)
+bool BlenderSync::psys_need_update(BL::ParticleSystem b_psys)
{
/* Particle data is only needed for
* a) Billboard render mode if object's own material uses particle info
@@ -41,9 +41,7 @@
*/
bool need_update = false;
- BL::Object::particle_systems_iterator b_psys;
- for (b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
- switch (b_psys->settings().render_type()) {
+ switch (b_psys.settings().render_type()) {
/* XXX not implemented yet!
* billboards/strands would become part of the mesh data (?),
* so the mesh attributes would store whether particle info is required.
@@ -61,7 +59,7 @@
#endif
case BL::ParticleSettings::render_type_OBJECT: {
- BL::Object b_dupli_ob = b_psys->settings().dupli_object();
+ BL::Object b_dupli_ob = b_psys.settings().dupli_object();
if (b_dupli_ob) {
BL::ID key = (BKE_object_is_modified(b_dupli_ob))? b_dupli_ob: b_dupli_ob.data();
Mesh *mesh = mesh_map.find(key);
@@ -73,7 +71,7 @@
}
case BL::ParticleSettings::render_type_GROUP: {
- BL::Group b_dupli_group = b_psys->settings().dupli_group();
+ BL::Group b_dupli_group = b_psys.settings().dupli_group();
if (b_dupli_group) {
BL::Group::objects_iterator b_gob;
for (b_dupli_group.objects.begin(b_gob); b_gob != b_dupli_group.objects.end(); ++b_gob) {
@@ -90,7 +88,6 @@
default:
/* avoid compiler warning */
break;
- }
}
return need_update;
@@ -114,53 +111,109 @@
static bool use_particle(BL::Particle b_pa)
{
- return b_pa.is_exist() && b_pa.is_visible() && b_pa.alive_state()==BL::Particle::alive_state_ALIVE;
+ return b_pa.is_exist() && b_pa.is_visible() &&
+ (b_pa.alive_state()==BL::Particle::alive_state_ALIVE || b_pa.alive_state()==BL::Particle::alive_state_DYING);
}
+static int psys_count_particles(BL::ParticleSystem b_psys)
+{
+ int tot = 0;
+ BL::ParticleSystem::particles_iterator b_pa;
+ for(b_psys.particles.begin(b_pa); b_pa != b_psys.particles.end(); ++b_pa) {
+ if(use_particle(*b_pa))
+ ++tot;
+ }
+ return tot;
+}
+
int BlenderSync::object_count_particles(BL::Object b_ob)
{
int tot = 0;
BL::Object::particle_systems_iterator b_psys;
for(b_ob.particle_systems.begin(b_psys); b_psys != b_ob.particle_systems.end(); ++b_psys) {
- if (use_particle_system(*b_psys)) {
- BL::ParticleSystem::particles_iterator b_pa;
- for(b_psys->particles.begin(b_pa); b_pa != b_psys->particles.end(); ++b_pa) {
- if(use_particle(*b_pa))
- ++tot;
- }
- }
+ if (use_particle_system(*b_psys))
+ tot += psys_count_particles(*b_psys);
}
return tot;
}
-void BlenderSync::sync_particles(Object *ob, BL::Object b_ob)
+void BlenderSync::sync_particles(BL::Object b_ob, BL::ParticleSystem b_psys)
{
- int tot = object_count_particles(b_ob);
+ /* depending on settings the psys may not even be rendered */
+ if (!use_particle_system(b_psys))
+ return;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list