[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50429] branches/cloth-eltopo: Merge from trunk r50208-r50428
Daniel Genrich
daniel.genrich at gmx.net
Wed Sep 5 19:41:55 CEST 2012
Revision: 50429
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50429
Author: genscher
Date: 2012-09-05 17:41:54 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Merge from trunk r50208-r50428
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50208
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50428
Modified Paths:
--------------
branches/cloth-eltopo/build_files/scons/config/win32-mingw-config.py
branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
branches/cloth-eltopo/doc/python_api/sphinx_doc_gen.py
branches/cloth-eltopo/extern/bullet2/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/app/cycles_test.cpp
branches/cloth-eltopo/intern/cycles/app/cycles_xml.cpp
branches/cloth-eltopo/intern/cycles/blender/addon/properties.py
branches/cloth-eltopo/intern/cycles/blender/addon/ui.py
branches/cloth-eltopo/intern/cycles/blender/blender_mesh.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_object.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_particles.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_python.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_session.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_session.h
branches/cloth-eltopo/intern/cycles/blender/blender_shader.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_sync.cpp
branches/cloth-eltopo/intern/cycles/blender/blender_sync.h
branches/cloth-eltopo/intern/cycles/blender/blender_util.h
branches/cloth-eltopo/intern/cycles/cmake/external_libs.cmake
branches/cloth-eltopo/intern/cycles/device/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/device/device.cpp
branches/cloth-eltopo/intern/cycles/device/device.h
branches/cloth-eltopo/intern/cycles/device/device_cpu.cpp
branches/cloth-eltopo/intern/cycles/device/device_cuda.cpp
branches/cloth-eltopo/intern/cycles/device/device_multi.cpp
branches/cloth-eltopo/intern/cycles/device/device_opencl.cpp
branches/cloth-eltopo/intern/cycles/kernel/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/kernel/kernel.cpp
branches/cloth-eltopo/intern/cycles/kernel/kernel_accumulate.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_compat_cpu.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_displace.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_globals.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_object.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_path.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_shader.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_textures.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_triangle.h
branches/cloth-eltopo/intern/cycles/kernel/kernel_types.h
branches/cloth-eltopo/intern/cycles/kernel/osl/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_math.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_texture.h
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/stdosl.h
branches/cloth-eltopo/intern/cycles/kernel/osl/osl_globals.h
branches/cloth-eltopo/intern/cycles/kernel/osl/osl_services.cpp
branches/cloth-eltopo/intern/cycles/kernel/osl/osl_services.h
branches/cloth-eltopo/intern/cycles/kernel/osl/osl_shader.cpp
branches/cloth-eltopo/intern/cycles/kernel/osl/osl_shader.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_geometry.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_image.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_math.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_mix.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_tex_coord.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_types.h
branches/cloth-eltopo/intern/cycles/render/CMakeLists.txt
branches/cloth-eltopo/intern/cycles/render/attribute.cpp
branches/cloth-eltopo/intern/cycles/render/attribute.h
branches/cloth-eltopo/intern/cycles/render/buffers.cpp
branches/cloth-eltopo/intern/cycles/render/buffers.h
branches/cloth-eltopo/intern/cycles/render/camera.cpp
branches/cloth-eltopo/intern/cycles/render/camera.h
branches/cloth-eltopo/intern/cycles/render/graph.cpp
branches/cloth-eltopo/intern/cycles/render/graph.h
branches/cloth-eltopo/intern/cycles/render/image.cpp
branches/cloth-eltopo/intern/cycles/render/image.h
branches/cloth-eltopo/intern/cycles/render/light.cpp
branches/cloth-eltopo/intern/cycles/render/mesh.cpp
branches/cloth-eltopo/intern/cycles/render/nodes.cpp
branches/cloth-eltopo/intern/cycles/render/nodes.h
branches/cloth-eltopo/intern/cycles/render/object.cpp
branches/cloth-eltopo/intern/cycles/render/object.h
branches/cloth-eltopo/intern/cycles/render/osl.cpp
branches/cloth-eltopo/intern/cycles/render/scene.cpp
branches/cloth-eltopo/intern/cycles/render/scene.h
branches/cloth-eltopo/intern/cycles/render/session.cpp
branches/cloth-eltopo/intern/cycles/render/session.h
branches/cloth-eltopo/intern/cycles/render/tile.cpp
branches/cloth-eltopo/intern/cycles/render/tile.h
branches/cloth-eltopo/intern/cycles/util/util_math.h
branches/cloth-eltopo/intern/cycles/util/util_progress.h
branches/cloth-eltopo/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/cloth-eltopo/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/cloth-eltopo/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/cloth-eltopo/intern/guardedalloc/intern/mmap_win.c
branches/cloth-eltopo/intern/opennl/intern/opennl.c
branches/cloth-eltopo/release/scripts/modules/addon_utils.py
branches/cloth-eltopo/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/cloth-eltopo/release/scripts/startup/bl_operators/object_quick_effects.py
branches/cloth-eltopo/release/scripts/startup/bl_operators/wm.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/properties_mask_common.py
branches/cloth-eltopo/release/scripts/startup/bl_ui/space_sequencer.py
branches/cloth-eltopo/release/scripts/templates/operator_modal.py
branches/cloth-eltopo/release/scripts/templates/operator_modal_draw.py
branches/cloth-eltopo/release/scripts/templates/operator_modal_timer.py
branches/cloth-eltopo/release/scripts/templates/operator_modal_view3d.py
branches/cloth-eltopo/source/blender/blenfont/intern/blf_dir.c
branches/cloth-eltopo/source/blender/blenkernel/BKE_DerivedMesh.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_anim.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_armature.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_blender.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_deform.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_image.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_mask.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_node.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_sequencer.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_utildefines.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_world.h
branches/cloth-eltopo/source/blender/blenkernel/CMakeLists.txt
branches/cloth-eltopo/source/blender/blenkernel/intern/DerivedMesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/anim.c
branches/cloth-eltopo/source/blender/blenkernel/intern/anim_sys.c
branches/cloth-eltopo/source/blender/blenkernel/intern/armature.c
branches/cloth-eltopo/source/blender/blenkernel/intern/blender.c
branches/cloth-eltopo/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cloth-eltopo/source/blender/blenkernel/intern/colortools.c
branches/cloth-eltopo/source/blender/blenkernel/intern/constraint.c
branches/cloth-eltopo/source/blender/blenkernel/intern/customdata.c
branches/cloth-eltopo/source/blender/blenkernel/intern/customdata_file.c
branches/cloth-eltopo/source/blender/blenkernel/intern/deform.c
branches/cloth-eltopo/source/blender/blenkernel/intern/depsgraph.c
branches/cloth-eltopo/source/blender/blenkernel/intern/fcurve.c
branches/cloth-eltopo/source/blender/blenkernel/intern/font.c
branches/cloth-eltopo/source/blender/blenkernel/intern/idprop.c
branches/cloth-eltopo/source/blender/blenkernel/intern/image.c
branches/cloth-eltopo/source/blender/blenkernel/intern/library.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mask.c
branches/cloth-eltopo/source/blender/blenkernel/intern/mball.c
branches/cloth-eltopo/source/blender/blenkernel/intern/movieclip.c
branches/cloth-eltopo/source/blender/blenkernel/intern/node.c
branches/cloth-eltopo/source/blender/blenkernel/intern/ocean.c
branches/cloth-eltopo/source/blender/blenkernel/intern/packedFile.c
branches/cloth-eltopo/source/blender/blenkernel/intern/pointcache.c
branches/cloth-eltopo/source/blender/blenkernel/intern/sca.c
branches/cloth-eltopo/source/blender/blenkernel/intern/seqeffects.c
branches/cloth-eltopo/source/blender/blenkernel/intern/seqmodifier.c
branches/cloth-eltopo/source/blender/blenkernel/intern/sequencer.c
branches/cloth-eltopo/source/blender/blenkernel/intern/sound.c
branches/cloth-eltopo/source/blender/blenkernel/intern/texture.c
branches/cloth-eltopo/source/blender/blenkernel/intern/tracking.c
branches/cloth-eltopo/source/blender/blenkernel/intern/world.c
branches/cloth-eltopo/source/blender/blenkernel/intern/writeffmpeg.c
branches/cloth-eltopo/source/blender/blenlib/BLI_fileops.h
branches/cloth-eltopo/source/blender/blenlib/BLI_math_vector.h
branches/cloth-eltopo/source/blender/blenlib/BLI_path_util.h
branches/cloth-eltopo/source/blender/blenlib/BLI_pbvh.h
branches/cloth-eltopo/source/blender/blenlib/BLI_string.h
branches/cloth-eltopo/source/blender/blenlib/BLI_utildefines.h
branches/cloth-eltopo/source/blender/blenlib/CMakeLists.txt
branches/cloth-eltopo/source/blender/blenlib/intern/BLI_memarena.c
branches/cloth-eltopo/source/blender/blenlib/intern/BLI_mempool.c
branches/cloth-eltopo/source/blender/blenlib/intern/bpath.c
branches/cloth-eltopo/source/blender/blenlib/intern/fileops.c
branches/cloth-eltopo/source/blender/blenlib/intern/math_vector.c
branches/cloth-eltopo/source/blender/blenlib/intern/path_util.c
branches/cloth-eltopo/source/blender/blenlib/intern/pbvh.c
branches/cloth-eltopo/source/blender/blenlib/intern/storage.c
branches/cloth-eltopo/source/blender/blenlib/intern/string.c
branches/cloth-eltopo/source/blender/blenlib/intern/winstuff.c
branches/cloth-eltopo/source/blender/blenloader/CMakeLists.txt
branches/cloth-eltopo/source/blender/blenloader/intern/readblenentry.c
branches/cloth-eltopo/source/blender/blenloader/intern/readfile.c
branches/cloth-eltopo/source/blender/blenloader/intern/runtime.c
branches/cloth-eltopo/source/blender/blenloader/intern/versioning_250.c
branches/cloth-eltopo/source/blender/blenloader/intern/versioning_legacy.c
branches/cloth-eltopo/source/blender/blenloader/intern/writefile.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_error.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_marking.c
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_marking.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_mods.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_operator_api.h
branches/cloth-eltopo/source/blender/bmesh/intern/bmesh_polygon.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_extrude.c
branches/cloth-eltopo/source/blender/bmesh/operators/bmo_inset.c
branches/cloth-eltopo/source/blender/bmesh/tools/BME_bevel.c
branches/cloth-eltopo/source/blender/collada/AnimationExporter.h
branches/cloth-eltopo/source/blender/collada/AnimationImporter.cpp
branches/cloth-eltopo/source/blender/collada/DocumentExporter.cpp
branches/cloth-eltopo/source/blender/collada/DocumentImporter.cpp
branches/cloth-eltopo/source/blender/collada/ImageExporter.cpp
branches/cloth-eltopo/source/blender/collada/MeshImporter.cpp
branches/cloth-eltopo/source/blender/collada/TransformReader.h
branches/cloth-eltopo/source/blender/collada/collada_internal.h
branches/cloth-eltopo/source/blender/compositor/COM_compositor.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_Device.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_Node.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_Node.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_NodeBase.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_Socket.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_SocketReader.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/cloth-eltopo/source/blender/compositor/intern/COM_WorkScheduler.h
branches/cloth-eltopo/source/blender/compositor/intern/COM_compositor.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/cloth-eltopo/source/blender/compositor/nodes/COM_TransformNode.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_CompositorOperation.h
branches/cloth-eltopo/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/cloth-eltopo/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/cloth-eltopo/source/blender/editors/animation/anim_channels_defines.c
branches/cloth-eltopo/source/blender/editors/animation/anim_deps.c
branches/cloth-eltopo/source/blender/editors/animation/anim_filter.c
branches/cloth-eltopo/source/blender/editors/animation/keyframes_draw.c
branches/cloth-eltopo/source/blender/editors/animation/keyframes_general.c
branches/cloth-eltopo/source/blender/editors/include/ED_mesh.h
branches/cloth-eltopo/source/blender/editors/include/UI_interface.h
branches/cloth-eltopo/source/blender/editors/include/UI_view2d.h
branches/cloth-eltopo/source/blender/editors/interface/interface.c
branches/cloth-eltopo/source/blender/editors/interface/interface_handlers.c
branches/cloth-eltopo/source/blender/editors/interface/interface_icons.c
branches/cloth-eltopo/source/blender/editors/interface/interface_intern.h
branches/cloth-eltopo/source/blender/editors/interface/interface_layout.c
branches/cloth-eltopo/source/blender/editors/interface/interface_ops.c
branches/cloth-eltopo/source/blender/editors/interface/interface_regions.c
branches/cloth-eltopo/source/blender/editors/interface/interface_style.c
branches/cloth-eltopo/source/blender/editors/interface/interface_templates.c
branches/cloth-eltopo/source/blender/editors/interface/interface_widgets.c
branches/cloth-eltopo/source/blender/editors/interface/view2d_ops.c
branches/cloth-eltopo/source/blender/editors/io/io_collada.c
branches/cloth-eltopo/source/blender/editors/mask/mask_draw.c
branches/cloth-eltopo/source/blender/editors/mesh/editmesh_knife.c
branches/cloth-eltopo/source/blender/editors/mesh/editmesh_select.c
branches/cloth-eltopo/source/blender/editors/mesh/editmesh_utils.c
branches/cloth-eltopo/source/blender/editors/mesh/mesh_data.c
branches/cloth-eltopo/source/blender/editors/mesh/mesh_navmesh.c
branches/cloth-eltopo/source/blender/editors/object/object_group.c
branches/cloth-eltopo/source/blender/editors/object/object_vgroup.c
branches/cloth-eltopo/source/blender/editors/physics/physics_fluid.c
branches/cloth-eltopo/source/blender/editors/render/render_preview.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_image.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_ops.c
branches/cloth-eltopo/source/blender/editors/sculpt_paint/paint_vertex.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_ops.c
branches/cloth-eltopo/source/blender/editors/space_clip/clip_toolbar.c
branches/cloth-eltopo/source/blender/editors/space_file/file_ops.c
branches/cloth-eltopo/source/blender/editors/space_file/space_file.c
branches/cloth-eltopo/source/blender/editors/space_image/image_ops.c
branches/cloth-eltopo/source/blender/editors/space_image/space_image.c
branches/cloth-eltopo/source/blender/editors/space_logic/logic_window.c
branches/cloth-eltopo/source/blender/editors/space_node/drawnode.c
branches/cloth-eltopo/source/blender/editors/space_node/node_buttons.c
branches/cloth-eltopo/source/blender/editors/space_node/node_templates.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_intern.h
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/cloth-eltopo/source/blender/editors/space_sequencer/sequencer_view.c
branches/cloth-eltopo/source/blender/editors/space_view3d/drawarmature.c
branches/cloth-eltopo/source/blender/editors/space_view3d/drawmesh.c
branches/cloth-eltopo/source/blender/editors/space_view3d/drawobject.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_draw.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_edit.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_fly.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_intern.h
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_select.c
branches/cloth-eltopo/source/blender/editors/space_view3d/view3d_toolbar.c
branches/cloth-eltopo/source/blender/editors/transform/transform.c
branches/cloth-eltopo/source/blender/editors/transform/transform.h
branches/cloth-eltopo/source/blender/editors/transform/transform_conversions.c
branches/cloth-eltopo/source/blender/editors/transform/transform_snap.c
branches/cloth-eltopo/source/blender/editors/util/CMakeLists.txt
branches/cloth-eltopo/source/blender/editors/util/ed_util.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_draw.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_ops.c
branches/cloth-eltopo/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/cloth-eltopo/source/blender/gpu/GPU_buffers.h
branches/cloth-eltopo/source/blender/gpu/GPU_draw.h
branches/cloth-eltopo/source/blender/gpu/GPU_extensions.h
branches/cloth-eltopo/source/blender/gpu/GPU_material.h
branches/cloth-eltopo/source/blender/gpu/intern/gpu_codegen.c
branches/cloth-eltopo/source/blender/gpu/intern/gpu_codegen.h
branches/cloth-eltopo/source/blender/gpu/intern/gpu_draw.c
branches/cloth-eltopo/source/blender/gpu/intern/gpu_extensions.c
branches/cloth-eltopo/source/blender/gpu/intern/gpu_material.c
branches/cloth-eltopo/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/cloth-eltopo/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/cloth-eltopo/source/blender/imbuf/IMB_imbuf.h
branches/cloth-eltopo/source/blender/imbuf/IMB_thumbs.h
branches/cloth-eltopo/source/blender/imbuf/intern/IMB_indexer.h
branches/cloth-eltopo/source/blender/imbuf/intern/anim_movie.c
branches/cloth-eltopo/source/blender/imbuf/intern/bmp.c
branches/cloth-eltopo/source/blender/imbuf/intern/imbuf_cocoa.m
branches/cloth-eltopo/source/blender/imbuf/intern/indexer.c
branches/cloth-eltopo/source/blender/imbuf/intern/indexer_dv.c
branches/cloth-eltopo/source/blender/imbuf/intern/jp2.c
branches/cloth-eltopo/source/blender/imbuf/intern/moviecache.c
branches/cloth-eltopo/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/cloth-eltopo/source/blender/imbuf/intern/thumbs.c
branches/cloth-eltopo/source/blender/imbuf/intern/thumbs_blend.c
branches/cloth-eltopo/source/blender/imbuf/intern/util.c
branches/cloth-eltopo/source/blender/makesdna/DNA_ipo_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_mask_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_node_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_sdna_types.h
branches/cloth-eltopo/source/blender/makesdna/DNA_sequence_types.h
branches/cloth-eltopo/source/blender/makesdna/intern/makesdna.c
branches/cloth-eltopo/source/blender/makesrna/RNA_enum_types.h
branches/cloth-eltopo/source/blender/makesrna/intern/makesrna.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_armature.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_camera_api.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_fluidsim.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_gpencil.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_image.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_main.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_main_api.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_mask.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_nodetree_types.h
branches/cloth-eltopo/source/blender/makesrna/intern/rna_pose.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_render.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_scene.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_scene_api.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_sequencer.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_space.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_texture_api.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_tracking.c
branches/cloth-eltopo/source/blender/makesrna/intern/rna_wm_api.c
branches/cloth-eltopo/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_displace.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_mirror.c
branches/cloth-eltopo/source/blender/modifiers/intern/MOD_ocean.c
branches/cloth-eltopo/source/blender/nodes/CMakeLists.txt
branches/cloth-eltopo/source/blender/nodes/NOD_shader.h
branches/cloth-eltopo/source/blender/nodes/composite/node_composite_tree.c
branches/cloth-eltopo/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/cloth-eltopo/source/blender/nodes/intern/node_common.c
branches/cloth-eltopo/source/blender/nodes/intern/node_util.c
branches/cloth-eltopo/source/blender/nodes/intern/node_util.h
branches/cloth-eltopo/source/blender/nodes/shader/node_shader_tree.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/cloth-eltopo/source/blender/nodes/texture/node_texture_tree.c
branches/cloth-eltopo/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_api.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_ops.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_types_select.c
branches/cloth-eltopo/source/blender/python/bmesh/bmesh_py_utils.c
branches/cloth-eltopo/source/blender/python/generic/py_capi_utils.c
branches/cloth-eltopo/source/blender/python/intern/bpy_interface.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Color.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_Vector.c
branches/cloth-eltopo/source/blender/python/mathutils/mathutils_geometry.c
branches/cloth-eltopo/source/blender/quicktime/apple/qtkit_export.m
branches/cloth-eltopo/source/blender/quicktime/apple/qtkit_import.m
branches/cloth-eltopo/source/blender/render/extern/include/RE_engine.h
branches/cloth-eltopo/source/blender/render/extern/include/RE_pipeline.h
branches/cloth-eltopo/source/blender/render/extern/include/RE_render_ext.h
branches/cloth-eltopo/source/blender/render/intern/include/initrender.h
branches/cloth-eltopo/source/blender/render/intern/include/pixelshading.h
branches/cloth-eltopo/source/blender/render/intern/include/rayobject.h
branches/cloth-eltopo/source/blender/render/intern/include/render_result.h
branches/cloth-eltopo/source/blender/render/intern/source/external_engine.c
branches/cloth-eltopo/source/blender/render/intern/source/initrender.c
branches/cloth-eltopo/source/blender/render/intern/source/pipeline.c
branches/cloth-eltopo/source/blender/render/intern/source/render_result.c
branches/cloth-eltopo/source/blender/render/intern/source/render_texture.c
branches/cloth-eltopo/source/blender/render/intern/source/texture_ocean.c
branches/cloth-eltopo/source/blender/windowmanager/WM_api.h
branches/cloth-eltopo/source/blender/windowmanager/WM_keymap.h
branches/cloth-eltopo/source/blender/windowmanager/WM_types.h
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_event_system.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_operators.c
branches/cloth-eltopo/source/blender/windowmanager/intern/wm_playanim.c
branches/cloth-eltopo/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/cloth-eltopo/source/creator/CMakeLists.txt
branches/cloth-eltopo/source/creator/creator.c
branches/cloth-eltopo/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/cloth-eltopo/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/cloth-eltopo/source/gameengine/Expressions/BoolValue.cpp
branches/cloth-eltopo/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/CMakeLists.txt
branches/cloth-eltopo/source/gameengine/Ketsji/KX_Camera.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonInit.h
branches/cloth-eltopo/source/gameengine/Ketsji/KX_Scene.cpp
branches/cloth-eltopo/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/cloth-eltopo/source/tests/pep8.py
branches/cloth-eltopo/source/tools/codereview_upload.py
Added Paths:
-----------
branches/cloth-eltopo/intern/cycles/device/device_task.cpp
branches/cloth-eltopo/intern/cycles/device/device_task.h
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/oslutil.h
branches/cloth-eltopo/intern/cycles/kernel/svm/svm_brick.h
branches/cloth-eltopo/intern/cycles/render/particles.cpp
branches/cloth-eltopo/intern/cycles/render/particles.h
branches/cloth-eltopo/source/blender/blenkernel/BKE_object_deform.h
branches/cloth-eltopo/source/blender/blenkernel/intern/mask_evaluate.c
branches/cloth-eltopo/source/blender/blenkernel/intern/object_deform.c
branches/cloth-eltopo/source/blender/blenlib/BLI_endian_switch.h
branches/cloth-eltopo/source/blender/blenlib/BLI_endian_switch_inline.h
branches/cloth-eltopo/source/blender/blenlib/intern/endian_switch.c
branches/cloth-eltopo/source/blender/blenloader/BLO_blend_defs.h
branches/cloth-eltopo/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonMain.cpp
branches/cloth-eltopo/source/gameengine/Ketsji/KX_PythonMain.h
Removed Paths:
-------------
branches/cloth-eltopo/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
Property Changed:
----------------
branches/cloth-eltopo/source/blender/editors/interface/interface.c
branches/cloth-eltopo/source/blender/editors/space_outliner/
Modified: branches/cloth-eltopo/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/config/win32-mingw-config.py 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/build_files/scons/config/win32-mingw-config.py 2012-09-05 17:41:54 UTC (rev 50429)
@@ -172,7 +172,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/cloth-eltopo/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/build_files/scons/config/win64-mingw-config.py 2012-09-05 17:41:54 UTC (rev 50429)
@@ -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/cloth-eltopo/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/cloth-eltopo/doc/python_api/sphinx_doc_gen.py 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/doc/python_api/sphinx_doc_gen.py 2012-09-05 17:41:54 UTC (rev 50429)
@@ -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/cloth-eltopo/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/cloth-eltopo/extern/bullet2/CMakeLists.txt 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/extern/bullet2/CMakeLists.txt 2012-09-05 17:41:54 UTC (rev 50429)
@@ -314,6 +314,7 @@
src/BulletDynamics/Character/btKinematicCharacterController.h
src/BulletSoftBody/btSoftBody.h
+ src/BulletSoftBody/btSoftBodyInternals.h
src/BulletSoftBody/btSoftBodyData.h
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
src/BulletSoftBody/btSoftBodyHelpers.h
@@ -355,6 +356,7 @@
src/btBulletCollisionCommon.h
src/btBulletDynamicsCommon.h
+ src/Bullet-C-Api.h
)
if(CMAKE_COMPILER_IS_GNUCXX)
Modified: branches/cloth-eltopo/intern/cycles/CMakeLists.txt
===================================================================
--- branches/cloth-eltopo/intern/cycles/CMakeLists.txt 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/CMakeLists.txt 2012-09-05 17:41:54 UTC (rev 50429)
@@ -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/cloth-eltopo/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/cloth-eltopo/intern/cycles/app/cycles_test.cpp 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/app/cycles_test.cpp 2012-09-05 17:41:54 UTC (rev 50429)
@@ -66,12 +66,13 @@
static void session_print_status()
{
- int sample;
+ int sample, tile;
double total_time, sample_time;
string status, substatus;
/* get status */
- options.session->progress.get_sample(sample, total_time, sample_time);
+ sample = options.session->progress.get_sample();
+ options.session->progress.get_tile(tile, total_time, sample_time);
options.session->progress.get_status(status, substatus);
if(substatus != "")
@@ -111,7 +112,7 @@
static void scene_init(int width, int height)
{
- options.scene = new Scene(options.scene_params);
+ options.scene = new Scene(options.scene_params, options.session_params.device);
xml_read_file(options.scene, options.filepath.c_str());
if (width == 0 || height == 0) {
@@ -147,11 +148,12 @@
latency = (elapsed - last);
last = elapsed;
- int sample;
+ int sample, tile;
double total_time, sample_time;
string status, substatus;
- progress.get_sample(sample, total_time, sample_time);
+ sample = progress.get_sample();
+ progress.get_tile(tile, total_time, sample_time);
progress.get_status(status, substatus);
if(substatus != "")
Modified: branches/cloth-eltopo/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/cloth-eltopo/intern/cycles/app/cycles_xml.cpp 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/app/cycles_xml.cpp 2012-09-05 17:41:54 UTC (rev 50429)
@@ -379,6 +379,9 @@
else if(string_iequals(node.name(), "checker_texture")) {
snode = new CheckerTextureNode();
}
+ else if(string_iequals(node.name(), "brick_texture")) {
+ snode = new BrickTextureNode();
+ }
else if(string_iequals(node.name(), "gradient_texture")) {
GradientTextureNode *blend = new GradientTextureNode();
xml_read_enum(&blend->type, GradientTextureNode::type_enum, node, "type");
@@ -484,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")) {
@@ -515,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/cloth-eltopo/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/cloth-eltopo/intern/cycles/blender/addon/properties.py 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/blender/addon/properties.py 2012-09-05 17:41:54 UTC (rev 50429)
@@ -241,12 +241,14 @@
min=1, max=4096,
default=1024,
)
- cls.debug_min_size = IntProperty(
- name="Min Size",
- description="",
- min=1, max=4096,
- default=64,
+
+ cls.resolution_divider = IntProperty(
+ name="Resolution Divider",
+ description="For viewport render, the number of lower resolutions to render before the full resolution",
+ min=1, max=512,
+ default=4,
)
+
cls.debug_reset_timeout = FloatProperty(
name="Reset timeout",
description="",
Modified: branches/cloth-eltopo/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/cloth-eltopo/intern/cycles/blender/addon/ui.py 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/blender/addon/ui.py 2012-09-05 17:41:54 UTC (rev 50429)
@@ -197,9 +197,14 @@
sub = col.column(align=True)
sub.label(text="Tiles:")
- sub.prop(cscene, "debug_tile_size")
- sub.prop(cscene, "debug_min_size")
+ sub.prop(rd, "parts_x", text="X")
+ sub.prop(rd, "parts_y", text="Y")
+
+ subsub = sub.column()
+ subsub.enabled = not rd.use_border
+ subsub.prop(rd, "use_save_buffers")
+
col = split.column()
sub = col.column(align=True)
@@ -208,7 +213,11 @@
sub.prop(cscene, "debug_use_spatial_splits")
sub.prop(cscene, "use_cache")
+ sub = col.column(align=True)
+ sub.label(text="Viewport:")
+ sub.prop(cscene, "resolution_divider")
+
class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
bl_label = "Layers"
bl_options = {'DEFAULT_CLOSED'}
@@ -920,6 +929,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/cloth-eltopo/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/cloth-eltopo/intern/cycles/blender/blender_mesh.cpp 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/blender/blender_mesh.cpp 2012-09-05 17:41:54 UTC (rev 50429)
@@ -317,11 +317,11 @@
BL::Mesh::vertices_iterator v;
AttributeStandard std = (motion == -1)? ATTR_STD_MOTION_PRE: ATTR_STD_MOTION_POST;
Attribute *attr_M = mesh->attributes.add(std);
- float3 *M = attr_M->data_float3();
+ float3 *M = attr_M->data_float3(), *cur_M;
size_t i = 0;
- for(b_mesh.vertices.begin(v); v != b_mesh.vertices.end() && i < size; ++v, M++, i++)
- *M = get_float3(v->co());
+ for(b_mesh.vertices.begin(v), cur_M = M; v != b_mesh.vertices.end() && i < size; ++v, cur_M++, i++)
+ *cur_M = get_float3(v->co());
/* if number of vertices changed, or if coordinates stayed the same, drop it */
if(i != size || memcmp(M, &mesh->verts[0], sizeof(float3)*size) == 0)
Modified: branches/cloth-eltopo/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/cloth-eltopo/intern/cycles/blender/blender_object.cpp 2012-09-05 17:08:56 UTC (rev 50428)
+++ branches/cloth-eltopo/intern/cycles/blender/blender_object.cpp 2012-09-05 17:41:54 UTC (rev 50429)
@@ -247,11 +247,10 @@
scene->object_manager->tag_update(scene);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list