[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46421] branches/soc-2011-tomato: Merging r46203 through r46413 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue May 8 15:01:16 CEST 2012
Revision: 46421
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46421
Author: nazgul
Date: 2012-05-08 13:01:16 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Merging r46203 through r46413 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46203
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46413
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/soc-2011-tomato/intern/SConscript
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_object.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/bvh/bvh_binning.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.cpp
branches/soc-2011-tomato/intern/cycles/bvh/bvh_build.h
branches/soc-2011-tomato/intern/cycles/device/device_cpu.cpp
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/kernel_camera.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.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/svm/svm.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_mapping.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/camera.cpp
branches/soc-2011-tomato/intern/cycles/render/camera.h
branches/soc-2011-tomato/intern/cycles/render/image.cpp
branches/soc-2011-tomato/intern/cycles/render/image.h
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/mesh.cpp
branches/soc-2011-tomato/intern/cycles/render/mesh.h
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.h
branches/soc-2011-tomato/intern/cycles/util/util_math.h
branches/soc-2011-tomato/intern/cycles/util/util_task.cpp
branches/soc-2011-tomato/intern/cycles/util/util_task.h
branches/soc-2011-tomato/intern/cycles/util/util_transform.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/avi/intern/avirgb.c
branches/soc-2011-tomato/source/blender/avi/intern/codecs.c
branches/soc-2011-tomato/source/blender/avi/intern/endian.c
branches/soc-2011-tomato/source/blender/avi/intern/mjpeg.c
branches/soc-2011-tomato/source/blender/avi/intern/options.c
branches/soc-2011-tomato/source/blender/avi/intern/rgb32.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_action.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_brush.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_constraint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_font.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_gpencil.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_group.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_ipo.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_key.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_lattice.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_material.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mball.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sound.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_speaker.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_text.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_world.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeavi.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.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/booleanops_mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.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/image_gen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.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/paint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/property.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.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/blenkernel/intern/world.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_bitmap.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_bpath.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_jitter.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_uvproject.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_voxel.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-tomato/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/blenlib/intern/jitter.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/uvproject.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voxel.c
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.h
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_validate.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.h
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
branches/soc-2011-tomato/source/blender/collada/SkinInfo.h
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada.h
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.h
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/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_undo.c
branches/soc-2011-tomato/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-tomato/source/blender/editors/include/ED_clip.h
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-tomato/source/blender/editors/include/ED_sculpt.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.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_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_group.c
branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
branches/soc-2011-tomato/source/blender/editors/object/object_intern.h
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_boids.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_context.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_ops.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_draw.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_stats.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-tomato/source/blender/editors/space_logic/space_logic.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_intern.h
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawanimviz.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/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.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_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/moviecache.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.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_text_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.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_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/render/intern/include/strand.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
branches/soc-2011-tomato/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Added Paths:
-----------
branches/soc-2011-tomato/intern/cycles/kernel/kernel_projection.h
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/nodes/shader/nodes/node_shader_light_falloff.c
branches/soc-2011-tomato/source/tools/GL/
branches/soc-2011-tomato/source/tools/GL/README.txt
branches/soc-2011-tomato/source/tools/GL/core.gl
branches/soc-2011-tomato/source/tools/GL/es11.gl
branches/soc-2011-tomato/source/tools/GL/es20.gl
branches/soc-2011-tomato/source/tools/GL/extensions.gl
branches/soc-2011-tomato/source/tools/GL/glreport.py
branches/soc-2011-tomato/source/tools/GL/system.gl
Removed Paths:
-------------
branches/soc-2011-tomato/source/tools/GL/README.txt
branches/soc-2011-tomato/source/tools/GL/core.gl
branches/soc-2011-tomato/source/tools/GL/es11.gl
branches/soc-2011-tomato/source/tools/GL/es20.gl
branches/soc-2011-tomato/source/tools/GL/extensions.gl
branches/soc-2011-tomato/source/tools/GL/glreport.py
branches/soc-2011-tomato/source/tools/GL/system.gl
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-46202
+ /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-46413
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-08 13:01:16 UTC (rev 46421)
@@ -1641,6 +1641,7 @@
PATH_SUFFIXES
site-packages
dist-packages
+ NO_DEFAULT_PATH
)
if(NOT EXISTS "${PYTHON_NUMPY_PATH}")
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h 2012-05-08 13:01:16 UTC (rev 46421)
@@ -354,7 +354,7 @@
//! Calcs global transform of the offsets
/*!
- Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
+ Calcs the global transform for the joint offset for body A an B, and also calcs the angle differences between the bodies.
\sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo
*/
void calculateTransforms(const btTransform& transA,const btTransform& transB);
Modified: branches/soc-2011-tomato/intern/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/SConscript 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/SConscript 2012-05-08 13:01:16 UTC (rev 46421)
@@ -17,25 +17,16 @@
'smoke/SConscript',
'raskter/SConscript'])
-# NEW_CSG was intended for intern/csg, but
-# getting it to compile is difficult
-# intern/bsp has been used anyway, so
-# perhaps get rid of intern/csg?
-NEW_CSG = 'false'
-
if env ['WITH_BF_REMESH']:
SConscript(['dualcon/SConscript'])
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
-
+
if env['WITH_BF_CYCLES']:
SConscript(['cycles/SConscript'])
-if NEW_CSG == 'false':
- SConscript(['bsp/SConscript'])
-else:
- SConscript(['csg/SConscript'])
+SConscript(['bsp/SConscript'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript'])
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_Reference.h 2012-05-08 13:01:16 UTC (rev 46421)
@@ -174,8 +174,14 @@
std::cerr << "-" << typeid(*m_reference).name() << std::endl;
#endif
if(AUD_ReferenceHandler::decref(m_original))
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
delete m_reference;
- pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ }
+ else
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+ }
}
/**
@@ -194,7 +200,11 @@
std::cerr << "-" << typeid(*m_reference).name() << std::endl;
#endif
if(AUD_ReferenceHandler::decref(m_original))
+ {
+ pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
delete m_reference;
+ pthread_mutex_lock(AUD_ReferenceHandler::getMutex());
+ }
m_original = ref.m_original;
m_reference = ref.m_reference;
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_SequencerHandle.cpp 2012-05-08 13:01:16 UTC (rev 46421)
@@ -154,6 +154,7 @@
if(seekpos < 0)
seekpos = 0;
seekpos += m_entry->m_skip;
+ m_handle->setPitch(1.0f);
m_handle->seek(seekpos);
if(position < m_entry->m_begin)
m_handle->pause();
Modified: branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/cycles/app/cycles_xml.cpp 2012-05-08 13:01:16 UTC (rev 46421)
@@ -290,9 +290,23 @@
cam->type = CAMERA_ORTHOGRAPHIC;
else if(xml_equal_string(node, "type", "perspective"))
cam->type = CAMERA_PERSPECTIVE;
- else if(xml_equal_string(node, "type", "environment"))
- cam->type = CAMERA_ENVIRONMENT;
+ else if(xml_equal_string(node, "type", "panorama"))
+ cam->type = CAMERA_PANORAMA;
+ if(xml_equal_string(node, "panorama_type", "equirectangular"))
+ cam->panorama_type = PANORAMA_EQUIRECTANGULAR;
+ else if(xml_equal_string(node, "panorama_type", "fisheye_equidistant"))
+ cam->panorama_type = PANORAMA_FISHEYE_EQUIDISTANT;
+ else if(xml_equal_string(node, "panorama_type", "fisheye_equisolid"))
+ cam->panorama_type = PANORAMA_FISHEYE_EQUISOLID;
+
+ xml_read_float(&cam->fisheye_fov, node, "fisheye_fov");
+ xml_read_float(&cam->fisheye_lens, node, "fisheye_lens");
+
+ xml_read_float(&cam->sensorwidth, node, "sensorwidth");
+ xml_read_float(&cam->sensorheight, node, "sensorheight");
+
+
cam->matrix = state.tfm;
cam->need_update = true;
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py 2012-05-08 13:01:16 UTC (rev 46421)
@@ -54,3 +54,9 @@
('RADIUS', "Radius", "Directly change the size of the aperture"),
('FSTOP', "F/stop", "Change the size of the aperture by f/stops"),
)
+
+panorama_types = (
+ ('EQUIRECTANGULAR', "Equirectangular", "Render the scene with a spherical camera, also known as Lat Long panorama"),
+ ('FISHEYE_EQUIDISTANT', "Fisheye Equidistant", "Ideal for fulldomes, ignore the sensor dimensions"),
+ ('FISHEYE_EQUISOLID', "Fisheye Equisolid", "Similar to most fisheye modern lens, take sensor dimensions into consideration"),
+ )
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py 2012-05-08 13:01:16 UTC (rev 46421)
@@ -278,6 +278,25 @@
subtype='ANGLE',
default=0,
)
+ cls.panorama_type = EnumProperty(
+ name="Panorama Type",
+ description="Distortion to use for the calculation",
+ items=enums.panorama_types,
+ default='FISHEYE_EQUISOLID',
+ )
+ cls.fisheye_fov = FloatProperty(
+ name="Field of View",
+ description="Field of view for the fisheye lens",
+ min=0.1745, soft_max=2*math.pi, max=10.0*math.pi,
+ subtype='ANGLE',
+ default=math.pi,
+ )
+ cls.fisheye_lens = FloatProperty(
+ name="Fisheye Lens",
+ description="Lens focal length (mm)",
+ min=0.01, soft_max=15.0, max=100.0,
+ default=10.5,
+ )
@classmethod
def unregister(cls):
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp 2012-05-08 11:52:35 UTC (rev 46420)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp 2012-05-08 13:01:16 UTC (rev 46421)
@@ -48,6 +48,10 @@
float2 pixelaspect;
+ PanoramaType panorama_type;
+ float fisheye_fov;
+ float fisheye_lens;
+
enum { AUTO, HORIZONTAL, VERTICAL } sensor_fit;
float sensor_width;
float sensor_height;
@@ -94,9 +98,37 @@
bcam->nearclip = b_camera.clip_start();
bcam->farclip = b_camera.clip_end();
- bcam->type = (b_camera.type() == BL::Camera::type_ORTHO)? CAMERA_ORTHOGRAPHIC: CAMERA_PERSPECTIVE;
- if(bcam->type == CAMERA_PERSPECTIVE && b_camera.use_panorama())
- bcam->type = CAMERA_ENVIRONMENT;
+ switch(b_camera.type())
+ {
+ case BL::Camera::type_ORTHO:
+ bcam->type = CAMERA_ORTHOGRAPHIC;
+ break;
+ case BL::Camera::type_PANO:
+ bcam->type = CAMERA_PANORAMA;
+ break;
+ case BL::Camera::type_PERSP:
+ default:
+ bcam->type = CAMERA_PERSPECTIVE;
+ break;
+ }
+
+ switch(RNA_enum_get(&ccamera, "panorama_type"))
+ {
+ case 1:
+ bcam->panorama_type = PANORAMA_FISHEYE_EQUIDISTANT;
+ break;
+ case 2:
+ bcam->panorama_type = PANORAMA_FISHEYE_EQUISOLID;
+ break;
+ case 0:
+ default:
+ bcam->panorama_type = PANORAMA_EQUIRECTANGULAR;
+ break;
+ }
+
+ bcam->fisheye_fov = RNA_float_get(&ccamera, "fisheye_fov");
+ bcam->fisheye_lens = RNA_float_get(&ccamera, "fisheye_lens");
+
bcam->ortho_scale = b_camera.ortho_scale();
bcam->lens = b_camera.lens();
@@ -138,7 +170,7 @@
{
Transform result;
- if(type == CAMERA_ENVIRONMENT) {
+ if(type == CAMERA_PANORAMA) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list