[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49329] branches/asset-browser: merge from trunk: rev.
Andrea Weikert
elubie at gmx.net
Sat Jul 28 15:48:30 CEST 2012
Revision: 49329
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49329
Author: elubie
Date: 2012-07-28 13:48:29 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
merge from trunk: rev. 49037-49325
Modified Paths:
--------------
branches/asset-browser/SConstruct
branches/asset-browser/build_files/scons/config/darwin-config.py
branches/asset-browser/build_files/scons/tools/Blender.py
branches/asset-browser/build_files/scons/tools/btools.py
branches/asset-browser/doc/manpage/blender.1
branches/asset-browser/doc/python_api/rst/bge.logic.rst
branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/jet.h
branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp
branches/asset-browser/intern/cycles/blender/blender_object.cpp
branches/asset-browser/intern/cycles/blender/blender_particles.cpp
branches/asset-browser/intern/cycles/blender/blender_sync.cpp
branches/asset-browser/intern/cycles/blender/blender_sync.h
branches/asset-browser/intern/cycles/kernel/kernel_object.h
branches/asset-browser/intern/cycles/kernel/kernel_types.h
branches/asset-browser/intern/cycles/kernel/svm/svm_geometry.h
branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
branches/asset-browser/intern/cycles/render/graph.cpp
branches/asset-browser/intern/cycles/render/image.cpp
branches/asset-browser/intern/cycles/render/nodes.cpp
branches/asset-browser/intern/cycles/render/object.cpp
branches/asset-browser/intern/cycles/render/object.h
branches/asset-browser/intern/cycles/subd/subd_build.cpp
branches/asset-browser/intern/cycles/util/util_cache.cpp
branches/asset-browser/intern/cycles/util/util_path.cpp
branches/asset-browser/intern/decimation/intern/LOD_QuadricEditor.cpp
branches/asset-browser/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
branches/asset-browser/intern/elbeem/intern/mvmcoords.cpp
branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/asset-browser/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/asset-browser/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/asset-browser/intern/ghost/intern/GHOST_SystemX11.cpp
branches/asset-browser/intern/ghost/intern/GHOST_Window.h
branches/asset-browser/intern/ghost/intern/GHOST_WindowNULL.h
branches/asset-browser/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/asset-browser/intern/ghost/intern/GHOST_WindowX11.cpp
branches/asset-browser/intern/guardedalloc/intern/mallocn.c
branches/asset-browser/intern/iksolver/extern/IK_solver.h
branches/asset-browser/intern/iksolver/intern/IK_QJacobian.cpp
branches/asset-browser/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/asset-browser/intern/iksolver/intern/IK_QJacobianSolver.h
branches/asset-browser/intern/iksolver/intern/IK_QSegment.cpp
branches/asset-browser/intern/iksolver/intern/IK_QSegment.h
branches/asset-browser/intern/iksolver/intern/IK_QTask.cpp
branches/asset-browser/intern/iksolver/intern/IK_QTask.h
branches/asset-browser/intern/iksolver/intern/IK_Solver.cpp
branches/asset-browser/intern/iksolver/intern/MT_ExpMap.cpp
branches/asset-browser/intern/itasc/Armature.cpp
branches/asset-browser/intern/itasc/kdl/utilities/utility_io.cpp
branches/asset-browser/intern/memutil/MEM_RefCountPtr.h
branches/asset-browser/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/asset-browser/release/scripts/startup/bl_operators/wm.py
branches/asset-browser/release/scripts/startup/bl_ui/__init__.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
branches/asset-browser/source/blender/blenfont/intern/blf_lang.c
branches/asset-browser/source/blender/blenkernel/BKE_blender.h
branches/asset-browser/source/blender/blenkernel/BKE_mask.h
branches/asset-browser/source/blender/blenkernel/BKE_paint.h
branches/asset-browser/source/blender/blenkernel/BKE_sequencer.h
branches/asset-browser/source/blender/blenkernel/BKE_tracking.h
branches/asset-browser/source/blender/blenkernel/intern/action.c
branches/asset-browser/source/blender/blenkernel/intern/anim.c
branches/asset-browser/source/blender/blenkernel/intern/brush.c
branches/asset-browser/source/blender/blenkernel/intern/collision.c
branches/asset-browser/source/blender/blenkernel/intern/colortools.c
branches/asset-browser/source/blender/blenkernel/intern/context.c
branches/asset-browser/source/blender/blenkernel/intern/curve.c
branches/asset-browser/source/blender/blenkernel/intern/depsgraph.c
branches/asset-browser/source/blender/blenkernel/intern/effect.c
branches/asset-browser/source/blender/blenkernel/intern/ipo.c
branches/asset-browser/source/blender/blenkernel/intern/lattice.c
branches/asset-browser/source/blender/blenkernel/intern/library.c
branches/asset-browser/source/blender/blenkernel/intern/mask.c
branches/asset-browser/source/blender/blenkernel/intern/material.c
branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
branches/asset-browser/source/blender/blenkernel/intern/object.c
branches/asset-browser/source/blender/blenkernel/intern/paint.c
branches/asset-browser/source/blender/blenkernel/intern/scene.c
branches/asset-browser/source/blender/blenkernel/intern/screen.c
branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
branches/asset-browser/source/blender/blenkernel/intern/softbody.c
branches/asset-browser/source/blender/blenkernel/intern/tracking.c
branches/asset-browser/source/blender/blenlib/BLI_math_rotation.h
branches/asset-browser/source/blender/blenlib/intern/freetypefont.c
branches/asset-browser/source/blender/blenlib/intern/lasso.c
branches/asset-browser/source/blender/blenlib/intern/math_geom.c
branches/asset-browser/source/blender/blenlib/intern/math_rotation.c
branches/asset-browser/source/blender/blenloader/intern/readfile.c
branches/asset-browser/source/blender/bmesh/bmesh_class.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_opdefines.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.c
branches/asset-browser/source/blender/bmesh/operators/bmo_bevel.c
branches/asset-browser/source/blender/bmesh/operators/bmo_create.c
branches/asset-browser/source/blender/bmesh/operators/bmo_dissolve.c
branches/asset-browser/source/blender/bmesh/operators/bmo_dupe.c
branches/asset-browser/source/blender/bmesh/operators/bmo_extrude.c
branches/asset-browser/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/asset-browser/source/blender/bmesh/operators/bmo_mirror.c
branches/asset-browser/source/blender/bmesh/operators/bmo_primitive.c
branches/asset-browser/source/blender/bmesh/operators/bmo_removedoubles.c
branches/asset-browser/source/blender/bmesh/operators/bmo_subdivide.c
branches/asset-browser/source/blender/bmesh/operators/bmo_triangulate.c
branches/asset-browser/source/blender/bmesh/operators/bmo_utils.c
branches/asset-browser/source/blender/collada/AnimationImporter.cpp
branches/asset-browser/source/blender/collada/GeometryExporter.cpp
branches/asset-browser/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/asset-browser/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/asset-browser/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/asset-browser/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/asset-browser/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_KeyingOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_MaskOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/asset-browser/source/blender/editors/animation/anim_channels_defines.c
branches/asset-browser/source/blender/editors/animation/anim_filter.c
branches/asset-browser/source/blender/editors/animation/keyframes_draw.c
branches/asset-browser/source/blender/editors/armature/editarmature.c
branches/asset-browser/source/blender/editors/armature/editarmature_retarget.c
branches/asset-browser/source/blender/editors/armature/editarmature_sketch.c
branches/asset-browser/source/blender/editors/armature/reeb.c
branches/asset-browser/source/blender/editors/curve/editcurve.c
branches/asset-browser/source/blender/editors/include/ED_clip.h
branches/asset-browser/source/blender/editors/include/ED_image.h
branches/asset-browser/source/blender/editors/include/ED_mask.h
branches/asset-browser/source/blender/editors/include/ED_mesh.h
branches/asset-browser/source/blender/editors/include/ED_object.h
branches/asset-browser/source/blender/editors/include/ED_sequencer.h
branches/asset-browser/source/blender/editors/include/ED_uvedit.h
branches/asset-browser/source/blender/editors/include/UI_interface.h
branches/asset-browser/source/blender/editors/include/UI_resources.h
branches/asset-browser/source/blender/editors/interface/interface.c
branches/asset-browser/source/blender/editors/interface/interface_draw.c
branches/asset-browser/source/blender/editors/interface/interface_handlers.c
branches/asset-browser/source/blender/editors/interface/interface_icons.c
branches/asset-browser/source/blender/editors/interface/interface_templates.c
branches/asset-browser/source/blender/editors/interface/resources.c
branches/asset-browser/source/blender/editors/interface/view2d_ops.c
branches/asset-browser/source/blender/editors/mask/mask_add.c
branches/asset-browser/source/blender/editors/mask/mask_draw.c
branches/asset-browser/source/blender/editors/mask/mask_edit.c
branches/asset-browser/source/blender/editors/mask/mask_intern.h
branches/asset-browser/source/blender/editors/mask/mask_ops.c
branches/asset-browser/source/blender/editors/mask/mask_select.c
branches/asset-browser/source/blender/editors/mesh/editmesh_knife.c
branches/asset-browser/source/blender/editors/mesh/editmesh_select.c
branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
branches/asset-browser/source/blender/editors/mesh/editmesh_utils.c
branches/asset-browser/source/blender/editors/mesh/meshtools.c
branches/asset-browser/source/blender/editors/object/object_add.c
branches/asset-browser/source/blender/editors/object/object_group.c
branches/asset-browser/source/blender/editors/object/object_lattice.c
branches/asset-browser/source/blender/editors/object/object_relations.c
branches/asset-browser/source/blender/editors/object/object_select.c
branches/asset-browser/source/blender/editors/object/object_vgroup.c
branches/asset-browser/source/blender/editors/physics/particle_boids.c
branches/asset-browser/source/blender/editors/render/render_opengl.c
branches/asset-browser/source/blender/editors/screen/screen_ops.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_image.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_utils.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_vertex.c
branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/asset-browser/source/blender/editors/space_buttons/buttons_context.c
branches/asset-browser/source/blender/editors/space_clip/clip_draw.c
branches/asset-browser/source/blender/editors/space_clip/clip_editor.c
branches/asset-browser/source/blender/editors/space_clip/clip_graph_ops.c
branches/asset-browser/source/blender/editors/space_clip/clip_intern.h
branches/asset-browser/source/blender/editors/space_clip/clip_ops.c
branches/asset-browser/source/blender/editors/space_clip/clip_utils.c
branches/asset-browser/source/blender/editors/space_clip/space_clip.c
branches/asset-browser/source/blender/editors/space_clip/tracking_ops.c
branches/asset-browser/source/blender/editors/space_clip/tracking_select.c
branches/asset-browser/source/blender/editors/space_console/console_draw.c
branches/asset-browser/source/blender/editors/space_file/file_ops.c
branches/asset-browser/source/blender/editors/space_file/filesel.c
branches/asset-browser/source/blender/editors/space_image/CMakeLists.txt
branches/asset-browser/source/blender/editors/space_image/image_buttons.c
branches/asset-browser/source/blender/editors/space_image/image_draw.c
branches/asset-browser/source/blender/editors/space_image/image_ops.c
branches/asset-browser/source/blender/editors/space_image/space_image.c
branches/asset-browser/source/blender/editors/space_info/info_draw.c
branches/asset-browser/source/blender/editors/space_node/drawnode.c
branches/asset-browser/source/blender/editors/space_node/node_edit.c
branches/asset-browser/source/blender/editors/space_node/space_node.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_tools.c
branches/asset-browser/source/blender/editors/space_sequencer/sequencer_draw.c
branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
branches/asset-browser/source/blender/editors/space_sequencer/space_sequencer.c
branches/asset-browser/source/blender/editors/space_view3d/drawarmature.c
branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_edit.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_fly.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_view.c
branches/asset-browser/source/blender/editors/transform/transform.c
branches/asset-browser/source/blender/editors/transform/transform_constraints.c
branches/asset-browser/source/blender/editors/transform/transform_conversions.c
branches/asset-browser/source/blender/editors/transform/transform_generics.c
branches/asset-browser/source/blender/editors/transform/transform_manipulator.c
branches/asset-browser/source/blender/editors/transform/transform_orientations.c
branches/asset-browser/source/blender/editors/transform/transform_snap.c
branches/asset-browser/source/blender/editors/util/undo.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_buttons.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_draw.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_ops.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/asset-browser/source/blender/gpu/GPU_material.h
branches/asset-browser/source/blender/gpu/intern/gpu_material.c
branches/asset-browser/source/blender/ikplugin/intern/iksolver_plugin.c
branches/asset-browser/source/blender/imbuf/intern/divers.c
branches/asset-browser/source/blender/imbuf/intern/filter.c
branches/asset-browser/source/blender/makesdna/DNA_ID.h
branches/asset-browser/source/blender/makesdna/DNA_node_types.h
branches/asset-browser/source/blender/makesdna/DNA_space_types.h
branches/asset-browser/source/blender/makesdna/DNA_userdef_types.h
branches/asset-browser/source/blender/makesrna/intern/rna_curve.c
branches/asset-browser/source/blender/makesrna/intern/rna_fcurve.c
branches/asset-browser/source/blender/makesrna/intern/rna_lattice.c
branches/asset-browser/source/blender/makesrna/intern/rna_mask.c
branches/asset-browser/source/blender/makesrna/intern/rna_nla.c
branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
branches/asset-browser/source/blender/makesrna/intern/rna_object.c
branches/asset-browser/source/blender/makesrna/intern/rna_rna.c
branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
branches/asset-browser/source/blender/makesrna/intern/rna_space.c
branches/asset-browser/source/blender/makesrna/intern/rna_userdef.c
branches/asset-browser/source/blender/modifiers/intern/MOD_array.c
branches/asset-browser/source/blender/modifiers/intern/MOD_bevel.c
branches/asset-browser/source/blender/modifiers/intern/MOD_boolean.c
branches/asset-browser/source/blender/modifiers/intern/MOD_cast.c
branches/asset-browser/source/blender/modifiers/intern/MOD_edgesplit.c
branches/asset-browser/source/blender/modifiers/intern/MOD_particlesystem.c
branches/asset-browser/source/blender/modifiers/intern/MOD_skin.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_ops.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_types.c
branches/asset-browser/source/blender/python/generic/bpy_internal_import.c
branches/asset-browser/source/blender/python/generic/bpy_internal_import.h
branches/asset-browser/source/blender/python/generic/py_capi_utils.c
branches/asset-browser/source/blender/python/generic/py_capi_utils.h
branches/asset-browser/source/blender/python/intern/bpy_rna.c
branches/asset-browser/source/blender/python/mathutils/mathutils_Quaternion.c
branches/asset-browser/source/blender/render/intern/source/convertblender.c
branches/asset-browser/source/blender/render/intern/source/initrender.c
branches/asset-browser/source/blender/render/intern/source/render_texture.c
branches/asset-browser/source/blender/render/intern/source/renderdatabase.c
branches/asset-browser/source/blender/render/intern/source/shadbuf.c
branches/asset-browser/source/blender/render/intern/source/strand.c
branches/asset-browser/source/blender/render/intern/source/zbuf.c
branches/asset-browser/source/blender/windowmanager/intern/wm_event_system.c
branches/asset-browser/source/blender/windowmanager/intern/wm_init_exit.c
branches/asset-browser/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.cpp
branches/asset-browser/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/asset-browser/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/asset-browser/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/asset-browser/source/gameengine/Converter/BL_MeshDeformer.h
branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/asset-browser/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/asset-browser/source/gameengine/Expressions/ListValue.h
branches/asset-browser/source/gameengine/Expressions/VoidValue.h
branches/asset-browser/source/gameengine/GameLogic/SCA_IObject.cpp
branches/asset-browser/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/asset-browser/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_GameActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Light.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_PyMath.h
branches/asset-browser/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_SceneActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/asset-browser/source/gameengine/Ketsji/KX_WorldInfo.h
branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/asset-browser/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_Deformer.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/asset-browser/source/gameengine/SceneGraph/SG_BBox.cpp
branches/asset-browser/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/asset-browser/source/gameengine/SceneGraph/SG_Tree.cpp
branches/asset-browser/source/gameengine/VideoTexture/ImageBase.cpp
branches/asset-browser/source/gameengine/VideoTexture/ImageRender.cpp
branches/asset-browser/source/gameengine/VideoTexture/SConscript
branches/asset-browser/source/gameengine/VideoTexture/Texture.cpp
branches/asset-browser/source/gameengine/VideoTexture/VideoBase.h
branches/asset-browser/source/tools/spell_check_source.py
branches/asset-browser/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/asset-browser/release/scripts/startup/bl_ui/properties_mask_common.py
branches/asset-browser/source/blender/editors/space_image/image_edit.c
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/source/blender/editors/interface/interface.c
branches/asset-browser/source/blender/editors/space_outliner/
Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793
/trunk/blender:43077-44985,44987-49036
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294
/trunk/blender:43077-44985,44987-49325
Modified: branches/asset-browser/SConstruct
===================================================================
--- branches/asset-browser/SConstruct 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/SConstruct 2012-07-28 13:48:29 UTC (rev 49329)
@@ -280,8 +280,10 @@
if env['OURPLATFORM']=='darwin':
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
- if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
- print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
+ if not 'Mac OS X 10.6' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.7.sdk"
+ elif not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
else:
print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
Modified: branches/asset-browser/build_files/scons/config/darwin-config.py
===================================================================
--- branches/asset-browser/build_files/scons/config/darwin-config.py 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/build_files/scons/config/darwin-config.py 2012-07-28 13:48:29 UTC (rev 49329)
@@ -32,6 +32,8 @@
MAC_CUR_VER='10.6'
elif cmd_res[:2]=='11':
MAC_CUR_VER='10.7'
+elif cmd_res[:2]=='12':
+ MAC_CUR_VER='10.8'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -75,7 +77,7 @@
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
CXX = 'g++-4.2'
- else:
+ elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
# OSX 10.6/7 with Xcode 4.x
MAC_MIN_VERS = '10.6'
MACOSX_DEPLOYMENT_TARGET = '10.6'
@@ -83,6 +85,14 @@
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
CXX = 'g++-4.2'
+ else:
+ # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc'
+ CXX = 'g++'
LIBDIR = '${LCGDIR}'
@@ -333,8 +343,8 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
-#for 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_DEPLOYMENT_TARGET == '10.7':
+#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/asset-browser/build_files/scons/tools/Blender.py
===================================================================
--- branches/asset-browser/build_files/scons/tools/Blender.py 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/build_files/scons/tools/Blender.py 2012-07-28 13:48:29 UTC (rev 49329)
@@ -693,11 +693,23 @@
run("rm -r '%s/turtle.py'" % py_target)
run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
+ if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
+ numpy_src = py_src + "/site-packages/numpy"
+ numpy_target = py_target + "/site-packages/numpy"
+
+ if os.path.exists(numpy_src):
+ print 'Install numpy from:'
+ print '\t"%s" into...' % numpy_src
+ print '\t"%s"\n' % numpy_target
+
+ run("cp -R '%s' '%s'" % (numpy_src, os.path.dirname(numpy_target)))
+ else:
+ print 'Failed to find numpy at %s, skipping copying' % numpy_src
+
run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
-
#### END ACTION STUFF #########
Modified: branches/asset-browser/build_files/scons/tools/btools.py
===================================================================
--- branches/asset-browser/build_files/scons/tools/btools.py 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/build_files/scons/tools/btools.py 2012-07-28 13:48:29 UTC (rev 49329)
@@ -135,7 +135,7 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
- 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
+ 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY'
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
@@ -520,6 +520,7 @@
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+ (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python mumpy module', False)),
(BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
(BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
Modified: branches/asset-browser/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/asset-browser/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/bge.logic.rst 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/doc/python_api/rst/bge.logic.rst 2012-07-28 13:48:29 UTC (rev 49329)
@@ -172,7 +172,7 @@
Restarts the current game by reloading the .blend file (the last saved version, not what is currently running).
-.. function:: LibLoad(blend, type, data, load_actions=False, verbose=False)
+.. function:: LibLoad(blend, type, data, load_actions=False, verbose=False, load_scripts=True)
Converts the all of the datablocks of the given type from the given blend.
@@ -186,6 +186,8 @@
:type load_actions: bool
:arg verbose: Whether or not to print debugging information (e.g., "SceneName: Scene")
:type verbose: bool
+ :arg load_scripts: Whether or not to load text datablocks as well (can be disabled for some extra security)
+ :type load_scripts: bool
.. function:: LibNew(name, type, data)
Modified: branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/jet.h
===================================================================
--- branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/jet.h 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/extern/libmv/third_party/ceres/include/ceres/jet.h 2012-07-28 13:48:29 UTC (rev 49329)
@@ -163,8 +163,8 @@
#include "Eigen/Core"
-// Visual Studio 2010 or older version
-#if defined(_MSC_VER) && _MSC_VER <= 1600
+// Visual Studio 2012 or older version
+#if defined(_MSC_VER) && _MSC_VER <= 1700
namespace std {
inline bool isfinite(double x) { return _finite(x); }
inline bool isinf (double x) { return !_finite(x) && !_isnan(x); }
Modified: branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
===================================================================
--- branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/collections_port.h 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/extern/libmv/third_party/ceres/internal/ceres/collections_port.h 2012-07-28 13:48:29 UTC (rev 49329)
@@ -33,7 +33,7 @@
#ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_
#define CERES_INTERNAL_COLLECTIONS_PORT_H_
-#if defined(_MSC_VER) && _MSC_VER <= 1600
+#if defined(_MSC_VER) && _MSC_VER <= 1700
#include <unordered_map>
#include <unordered_set>
#else
Modified: branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp
===================================================================
--- branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp 2012-07-28 11:36:01 UTC (rev 49328)
+++ branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp 2012-07-28 13:48:29 UTC (rev 49329)
@@ -547,13 +547,32 @@
return 0;
}
-static bool Carve_checkDegeneratedFace(MeshSet<3>::face_t *face)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list