[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45577] branches/meshdata_transfer: svn merge ^/trunk/blender -r45364:HEAD --accept postpone
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Thu Apr 12 18:01:25 CEST 2012
Revision: 45577
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45577
Author: cyborgmuppet
Date: 2012-04-12 16:01:24 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r45364:HEAD --accept postpone
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45364
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/build_files/scons/config/darwin-config.py
branches/meshdata_transfer/build_files/scons/config/freebsd7-config.py
branches/meshdata_transfer/build_files/scons/config/freebsd8-config.py
branches/meshdata_transfer/build_files/scons/config/freebsd9-config.py
branches/meshdata_transfer/build_files/scons/config/linux-config.py
branches/meshdata_transfer/build_files/scons/config/linuxcross-config.py
branches/meshdata_transfer/build_files/scons/config/win32-mingw-config.py
branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py
branches/meshdata_transfer/build_files/scons/config/win64-vc-config.py
branches/meshdata_transfer/build_files/scons/tools/btools.py
branches/meshdata_transfer/doc/manpage/blender.1
branches/meshdata_transfer/extern/libmv/CMakeLists.txt
branches/meshdata_transfer/extern/libmv/ChangeLog
branches/meshdata_transfer/extern/libmv/files.txt
branches/meshdata_transfer/extern/libmv/libmv/numeric/numeric.h
branches/meshdata_transfer/extern/libmv/libmv/simple_pipeline/resect.cc
branches/meshdata_transfer/extern/libmv/libmv-capi.cpp
branches/meshdata_transfer/extern/libmv/libmv-capi.h
branches/meshdata_transfer/extern/libmv/third_party/glog/src/config.h
branches/meshdata_transfer/intern/CMakeLists.txt
branches/meshdata_transfer/intern/SConscript
branches/meshdata_transfer/intern/cycles/blender/addon/properties.py
branches/meshdata_transfer/intern/cycles/blender/addon/ui.py
branches/meshdata_transfer/intern/cycles/blender/blender_camera.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp
branches/meshdata_transfer/intern/cycles/device/device_opencl.cpp
branches/meshdata_transfer/intern/cycles/kernel/kernel_accumulate.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_path.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
branches/meshdata_transfer/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/meshdata_transfer/intern/cycles/render/integrator.cpp
branches/meshdata_transfer/intern/cycles/render/integrator.h
branches/meshdata_transfer/intern/cycles/render/session.cpp
branches/meshdata_transfer/intern/cycles/util/util_math.h
branches/meshdata_transfer/intern/decimation/intern/LOD_EdgeCollapser.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/meshdata_transfer/intern/guardedalloc/intern/mallocn.c
branches/meshdata_transfer/intern/utfconv/CMakeLists.txt
branches/meshdata_transfer/intern/utfconv/SConscript
branches/meshdata_transfer/intern/utfconv/utf_winfunc.c
branches/meshdata_transfer/intern/utfconv/utf_winfunc.h
branches/meshdata_transfer/intern/utfconv/utfconv.c
branches/meshdata_transfer/intern/utfconv/utfconv.h
branches/meshdata_transfer/release/datafiles/datatoc.py
branches/meshdata_transfer/release/datafiles/fonts/droidsans.ttf.gz
branches/meshdata_transfer/release/plugins/sequence/color-correction-hsv.c
branches/meshdata_transfer/release/plugins/sequence/color-correction-yuv.c
branches/meshdata_transfer/release/plugins/sequence/dnr.c
branches/meshdata_transfer/release/plugins/sequence/gamma.c
branches/meshdata_transfer/release/plugins/texture/clouds2.c
branches/meshdata_transfer/release/plugins/texture/tiles.c
branches/meshdata_transfer/release/scripts/modules/bpy_extras/mesh_utils.py
branches/meshdata_transfer/release/scripts/modules/bpy_types.py
branches/meshdata_transfer/release/scripts/modules/console_python.py
branches/meshdata_transfer/release/scripts/presets/interface_theme/back_to_black.xml
branches/meshdata_transfer/release/scripts/presets/interface_theme/blender_24x.xml
branches/meshdata_transfer/release/scripts/presets/interface_theme/elsyiun.xml
branches/meshdata_transfer/release/scripts/presets/interface_theme/hexagon.xml
branches/meshdata_transfer/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/meshdata_transfer/release/scripts/presets/keyconfig/maya.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/clip.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/image.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/mesh.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/wm.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_curve.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_object.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_particle.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_field.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_texture.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_clip.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_dopesheet.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_graph.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_image.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_info.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_nla.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_sequencer.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_userpref.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/meshdata_transfer/release/scripts/templates/addon_add_object.py
branches/meshdata_transfer/release/text/readme.html
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/blenfont/intern/blf_lang.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_DerivedMesh.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_cloth.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_context.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_customdata.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_global.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_key.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_library.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_particle.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_text.h
branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/blender.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cloth.c
branches/meshdata_transfer/source/blender/blenkernel/intern/colortools.c
branches/meshdata_transfer/source/blender/blenkernel/intern/context.c
branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.c
branches/meshdata_transfer/source/blender/blenkernel/intern/deform.c
branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
branches/meshdata_transfer/source/blender/blenkernel/intern/editderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ipo.c
branches/meshdata_transfer/source/blender/blenkernel/intern/key.c
branches/meshdata_transfer/source/blender/blenkernel/intern/library.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
branches/meshdata_transfer/source/blender/blenkernel/intern/smoke.c
branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/meshdata_transfer/source/blender/blenkernel/intern/unit.c
branches/meshdata_transfer/source/blender/blenlib/BLI_array.h
branches/meshdata_transfer/source/blender/blenlib/BLI_math_vector.h
branches/meshdata_transfer/source/blender/blenlib/BLI_rect.h
branches/meshdata_transfer/source/blender/blenlib/BLI_winstuff.h
branches/meshdata_transfer/source/blender/blenlib/intern/BLI_dynstr.c
branches/meshdata_transfer/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/meshdata_transfer/source/blender/blenlib/intern/fileops.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_base.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_vector.c
branches/meshdata_transfer/source/blender/blenlib/intern/noise.c
branches/meshdata_transfer/source/blender/blenlib/intern/path_util.c
branches/meshdata_transfer/source/blender/blenlib/intern/rct.c
branches/meshdata_transfer/source/blender/blenlib/intern/storage.c
branches/meshdata_transfer/source/blender/blenlib/intern/winstuff.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/bmesh/CMakeLists.txt
branches/meshdata_transfer/source/blender/bmesh/bmesh_class.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_construct.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mods.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mods.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_opdefines.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operator_api.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operators_private.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_polygon.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_private.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_structure.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_bevel.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_connect.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_create.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_dissolve.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_dupe.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_edgesplit.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_extrude.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_inset.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_join_triangles.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_mirror.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_primitive.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_removedoubles.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_subdivide.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_subdivide.h
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_triangulate.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_utils.c
branches/meshdata_transfer/source/blender/bmesh/tools/BME_bevel.c
branches/meshdata_transfer/source/blender/collada/DocumentExporter.cpp
branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.c
branches/meshdata_transfer/source/blender/editors/datafiles/preview.blend.c
branches/meshdata_transfer/source/blender/editors/gpencil/drawgpencil.c
branches/meshdata_transfer/source/blender/editors/include/UI_interface.h
branches/meshdata_transfer/source/blender/editors/include/UI_interface_icons.h
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
branches/meshdata_transfer/source/blender/editors/interface/interface_icons.c
branches/meshdata_transfer/source/blender/editors/interface/interface_layout.c
branches/meshdata_transfer/source/blender/editors/interface/interface_ops.c
branches/meshdata_transfer/source/blender/editors/interface/interface_regions.c
branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/meshdata_transfer/source/blender/editors/interface/interface_widgets.c
branches/meshdata_transfer/source/blender/editors/mesh/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/mesh/editface.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_bvh.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_intern.h
branches/meshdata_transfer/source/blender/editors/mesh/mesh_ops.c
branches/meshdata_transfer/source/blender/editors/mesh/meshtools.c
branches/meshdata_transfer/source/blender/editors/object/object_intern.h
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/object/object_shapekey.c
branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
branches/meshdata_transfer/source/blender/editors/physics/particle_edit.c
branches/meshdata_transfer/source/blender/editors/render/render_opengl.c
branches/meshdata_transfer/source/blender/editors/screen/area.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_window.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_add.c
branches/meshdata_transfer/source/blender/editors/space_text/text_draw.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawvolume.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_buttons.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_snap.c
branches/meshdata_transfer/source/blender/editors/transform/transform_ops.c
branches/meshdata_transfer/source/blender/editors/util/crazyspace.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_buttons.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_draw.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_anim.h
branches/meshdata_transfer/source/blender/imbuf/intern/imageprocess.c
branches/meshdata_transfer/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/meshdata_transfer/source/blender/makesdna/DNA_action_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_armature_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_genfile.h
branches/meshdata_transfer/source/blender/makesdna/DNA_key_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_mesh_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_smoke_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_view3d_types.h
branches/meshdata_transfer/source/blender/makesdna/intern/makesdna.c
branches/meshdata_transfer/source/blender/makesrna/RNA_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/makesrna.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_brush.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_curve.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_define.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_group.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_key.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh_utils.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_modifier.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_force.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_particle.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_smoke.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_texture.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_tracking.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_ui.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_wm.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_displace.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_fluidsim.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_ocean.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.h
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_warp.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_wave.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_select.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_utils.c
branches/meshdata_transfer/source/blender/python/generic/idprop_py_api.c
branches/meshdata_transfer/source/blender/python/generic/idprop_py_api.h
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/render/intern/source/sunsky.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/CMakeLists.txt
branches/meshdata_transfer/source/creator/creator.c
branches/meshdata_transfer/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_DeformableGameObject.h
branches/meshdata_transfer/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/meshdata_transfer/source/gameengine/GameLogic/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/meshdata_transfer/source/gameengine/GameLogic/SConscript
branches/meshdata_transfer/source/gameengine/GamePlayer/ghost/GPG_System.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/BL_Material.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/BL_Material.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Camera.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Dome.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Dome.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_RayCast.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_TimeCategoryLogger.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_TimeLogger.cpp
branches/meshdata_transfer/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/meshdata_transfer/source/gameengine/SceneGraph/SG_BBox.cpp
branches/meshdata_transfer/source/gameengine/SceneGraph/SG_BBox.h
branches/meshdata_transfer/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/meshdata_transfer/source/gameengine/VideoTexture/VideoFFmpeg.h
Added Paths:
-----------
branches/meshdata_transfer/extern/libmv/libmv/simple_pipeline/rigid_registration.cc
branches/meshdata_transfer/extern/libmv/libmv/simple_pipeline/rigid_registration.h
branches/meshdata_transfer/extern/libmv/third_party/glog/src/config_hurd.h
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_slide.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_slide.c
branches/meshdata_transfer/source/tools/update_themes.py
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:44563-45364
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:44563-45576
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-04-12 16:01:24 UTC (rev 45577)
@@ -149,11 +149,14 @@
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
- option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
+ set(PLATFORM_DEFAULT ON)
else()
- option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+ set(PLATFORM_DEFAULT OFF)
endif()
+option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" PLATFORM_DEFAULT)
+unset(PLATFORM_DEFAULT)
+
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
@@ -304,8 +307,8 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_GAMEENGINE))
+ message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
endif()
if(NOT WITH_SDL AND WITH_GHOST_SDL)
@@ -325,13 +328,6 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-if(MINGW)
- if(WITH_CODEC_QUICKTIME)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
- endif()
-endif()
if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
@@ -358,7 +354,7 @@
endif()
if(WITH_GHOST_SDL OR WITH_HEADLESS)
- set(WITH_GHOST_XDND OFF)
+ set(WITH_GHOST_XDND OFF)
endif()
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -1660,6 +1656,7 @@
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_BUILTIN_GLEW)
+ info_cfg_option(WITH_MEM_JEMALLOC)
info_cfg_text("Image Formats:")
info_cfg_option(WITH_IMAGE_CINEON)
Modified: branches/meshdata_transfer/build_files/scons/config/darwin-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/darwin-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/darwin-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -101,7 +101,7 @@
WITH_BF_OPENMP = False
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -233,24 +233,6 @@
BF_FFTW3_LIB = 'libfftw3'
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB =
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
-# enable freetype2 support for text objects
BF_FREETYPE = LIBDIR + '/freetype'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
Modified: branches/meshdata_transfer/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/freebsd7-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/freebsd7-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: branches/meshdata_transfer/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/freebsd8-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/freebsd8-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: branches/meshdata_transfer/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/freebsd9-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/freebsd9-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: branches/meshdata_transfer/build_files/scons/config/linux-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/linux-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/linux-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -105,13 +105,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
#BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -124,7 +123,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR + '/ffmpeg'
if os.path.exists(LCGDIR + '/ffmpeg'):
WITH_BF_STATICFFMPEG = True
Modified: branches/meshdata_transfer/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/linuxcross-config.py 2012-04-12 15:31:48 UTC (rev 45576)
+++ branches/meshdata_transfer/build_files/scons/config/linuxcross-config.py 2012-04-12 16:01:24 UTC (rev 45577)
@@ -100,14 +100,13 @@
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-# enable freetype2 support for text objects
BF_WITH_FREETYPE = True
BF_FREETYPE = LIBDIR + '/gcc/freetype'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -120,7 +119,7 @@
WITH_BF_BINRELOC = False
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list