[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20975] branches/soc-2009-kazanbas: Merge from 2.5 r20855 through r20966

Arystanbek Dyussenov arystan.d at gmail.com
Thu Jun 18 13:42:30 CEST 2009


Revision: 20975
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20975
Author:   kazanbas
Date:     2009-06-18 13:42:30 +0200 (Thu, 18 Jun 2009)

Log Message:
-----------
Merge from 2.5 r20855 through r20966

Build fails: http://www.pasteall.org/6201/text

Modified Paths:
--------------
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
    branches/soc-2009-kazanbas/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2009-kazanbas/release/scripts/bpymodules/dxfLibrary.py
    branches/soc-2009-kazanbas/release/scripts/export_obj-2.5.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_armature.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_bone.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_camera.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_curve.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_empty.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lamp.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_lattice.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_mesh.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_modifier.py
    branches/soc-2009-kazanbas/release/ui/buttons_data_text.py
    branches/soc-2009-kazanbas/release/ui/buttons_material.py
    branches/soc-2009-kazanbas/release/ui/buttons_objects.py
    branches/soc-2009-kazanbas/release/ui/buttons_physic_cloth.py
    branches/soc-2009-kazanbas/release/ui/buttons_scene.py
    branches/soc-2009-kazanbas/release/ui/buttons_texture.py
    branches/soc-2009-kazanbas/release/ui/buttons_world.py
    branches/soc-2009-kazanbas/release/ui/space_sequencer.py
    branches/soc-2009-kazanbas/release/ui/space_text.py
    branches/soc-2009-kazanbas/source/Makefile
    branches/soc-2009-kazanbas/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_node.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/BKE_screen.h
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/action.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/curve.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/font.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/node.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-kazanbas/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-kazanbas/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-kazanbas/source/blender/editors/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/animation/anim_channels.c
    branches/soc-2009-kazanbas/source/blender/editors/animation/keyingsets.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/editarmature.c
    branches/soc-2009-kazanbas/source/blender/editors/armature/poseobject.c
    branches/soc-2009-kazanbas/source/blender/editors/curve/editcurve.c
    branches/soc-2009-kazanbas/source/blender/editors/curve/editfont.c
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_screen.h
    branches/soc-2009-kazanbas/source/blender/editors/include/ED_space_api.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_interface.h
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_resources.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_style.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-kazanbas/source/blender/editors/interface/resources.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-kazanbas/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/object/object_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/physics/editparticle.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/area.c
    branches/soc-2009-kazanbas/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-kazanbas/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_action/action_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_graph/graph_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_image/space_image.c
    branches/soc-2009-kazanbas/source/blender/editors/space_node/node_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_script/script_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2009-kazanbas/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/space_text.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2009-kazanbas/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-kazanbas/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2009-kazanbas/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2009-kazanbas/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2009-kazanbas/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2009-kazanbas/source/blender/gpu/intern/gpu_material.c
    branches/soc-2009-kazanbas/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-kazanbas/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_access.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_define.h
    branches/soc-2009-kazanbas/source/blender/makesrna/RNA_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/SConscript
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/Makefile
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/SConscript
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_color.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_context.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_image.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_key.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_property.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_radio.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sequence.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_sound.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_vpaint.c
    branches/soc-2009-kazanbas/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-kazanbas/source/blender/nodes/TEX_node.h
    branches/soc-2009-kazanbas/source/blender/python/BPY_extern.h
    branches/soc-2009-kazanbas/source/blender/python/SConscript
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.c
    branches/soc-2009-kazanbas/source/blender/python/intern/bpy_util.h
    branches/soc-2009-kazanbas/source/blender/render/intern/source/texture.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_event_system.h
    branches/soc-2009-kazanbas/source/blender/windowmanager/wm_window.h
    branches/soc-2009-kazanbas/source/creator/creator.c
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2009-kazanbas/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2009-kazanbas/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2009-kazanbas/source/gameengine/Converter/SConscript
    branches/soc-2009-kazanbas/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2009-kazanbas/source/gameengine/Expressions/Value.cpp
    branches/soc-2009-kazanbas/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2009-kazanbas/source/gameengine/Ketsji/SConscript
    branches/soc-2009-kazanbas/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2009-kazanbas/source/gameengine/PyDoc/API_intro.py
    branches/soc-2009-kazanbas/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2009-kazanbas/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2009-kazanbas/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2009-kazanbas/release/ui/space_image.py
    branches/soc-2009-kazanbas/source/blender/editors/include/UI_icons.h
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_window.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/space_logic.c
    branches/soc-2009-kazanbas/source/blender/nodes/intern/TEX_nodes/TEX_at.c
    branches/soc-2009-kazanbas/source/blender/python/generic/
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.c
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.c
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.c
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.h
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.c
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.c
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.h

Removed Paths:
-------------
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/Makefile
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/SConscript
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_header.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_intern.h
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/logic_window.c
    branches/soc-2009-kazanbas/source/blender/editors/space_logic/space_logic.c
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.c
    branches/soc-2009-kazanbas/source/blender/python/generic/BGL.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Geometry.h
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.c
    branches/soc-2009-kazanbas/source/blender/python/generic/Mathutils.h
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2009-kazanbas/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.c
    branches/soc-2009-kazanbas/source/blender/python/generic/euler.h
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.c
    branches/soc-2009-kazanbas/source/blender/python/generic/matrix.h
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.c
    branches/soc-2009-kazanbas/source/blender/python/generic/quat.h
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.c
    branches/soc-2009-kazanbas/source/blender/python/generic/vector.h
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
    branches/soc-2009-kazanbas/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h

Modified: branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.sln	2009-06-18 10:44:16 UTC (rev 20974)
+++ branches/soc-2009-kazanbas/projectfiles_vc9/blender/blender.sln	2009-06-18 11:42:30 UTC (rev 20975)
@@ -3,6 +3,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj", "{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F} = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}
+		{6E24BF09-9653-4166-A871-F65CC9E98A9B} = {6E24BF09-9653-4166-A871-F65CC9E98A9B}
 		{A90C4918-4B21-4277-93BD-AF65F30951D9} = {A90C4918-4B21-4277-93BD-AF65F30951D9}
 		{FB88301F-F725-401B-ACD7-D2ABBF333B71} = {FB88301F-F725-401B-ACD7-D2ABBF333B71}
 		{98330220-47A6-42E0-9DE4-AD0FF5D204D6} = {98330220-47A6-42E0-9DE4-AD0FF5D204D6}
@@ -11,6 +12,7 @@
 		{9625642D-6F20-4FB6-A089-BE7441B223E3} = {9625642D-6F20-4FB6-A089-BE7441B223E3}
 		{D1A9312F-4557-4982-A0F4-4D08508235F4} = {D1A9312F-4557-4982-A0F4-4D08508235F4}
 		{884D8731-654C-4C7F-9A75-8F37A305BE1E} = {884D8731-654C-4C7F-9A75-8F37A305BE1E}
+		{E645CC32-4823-463E-82F0-46ADDE664018} = {E645CC32-4823-463E-82F0-46ADDE664018}
 		{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} = {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
 		{FAF46346-65CC-4DB2-85C4-B99826F79D0C} = {FAF46346-65CC-4DB2-85C4-B99826F79D0C}
 		{51FB3D48-2467-4BFA-A321-D848252B437E} = {51FB3D48-2467-4BFA-A321-D848252B437E}
@@ -20,6 +22,7 @@
 		{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E} = {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}
 		{DB6BE55D-B6D9-494D-856A-8764FF7BA91D} = {DB6BE55D-B6D9-494D-856A-8764FF7BA91D}
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B} = {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}
+		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E} = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
 		{09222F5E-1625-4FF3-A89A-384D16875EE5} = {09222F5E-1625-4FF3-A89A-384D16875EE5}
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD} = {D696C86B-0B53-4471-A50D-5B983A6FA4AD}
 		{138DD16C-CC78-4F6C-A898-C8DA68D89067} = {138DD16C-CC78-4F6C-A898-C8DA68D89067}
@@ -27,10 +30,13 @@
 		{106AE171-0083-41D6-A949-20DB0E8DC251} = {106AE171-0083-41D6-A949-20DB0E8DC251}
 		{670EC17A-0548-4BBF-A27B-636C7C188139} = {670EC17A-0548-4BBF-A27B-636C7C188139}
 		{4C3AB78A-52CA-4276-A041-39776E52D8C8} = {4C3AB78A-52CA-4276-A041-39776E52D8C8}
+		{6B801390-5F95-4F07-81A7-97FBA046AACC} = {6B801390-5F95-4F07-81A7-97FBA046AACC}
 		{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94} = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
 		{76D90B92-ECC7-409C-9F98-A8814B90F3C0} = {76D90B92-ECC7-409C-9F98-A8814B90F3C0}
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8} = {9C71A793-C177-4CAB-8EC5-923D500B39F8}
+		{F90BD995-FFA4-4B18-81E8-FA4322C939E8} = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
 		{BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23} = {BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23}
+		{8154A59A-CAED-403D-AB94-BC4E7C032666} = {8154A59A-CAED-403D-AB94-BC4E7C032666}
 		{3648FB9A-C36F-43AB-AED0-1F1361E67FC7} = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
 		{542A9FA1-B7FF-441C-AE15-054DB31D3488} = {542A9FA1-B7FF-441C-AE15-054DB31D3488}
 		{E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B} = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
@@ -132,7 +138,9 @@
 		{BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE} = {BAAE3F2B-BCF8-4E84-B8BA-CFB2D64945FE}
 		{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} = {C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
 		{9625642D-6F20-4FB6-A089-BE7441B223E3} = {9625642D-6F20-4FB6-A089-BE7441B223E3}
+		{D1A9312F-4557-4982-A0F4-4D08508235F4} = {D1A9312F-4557-4982-A0F4-4D08508235F4}
 		{E645CC32-4823-463E-82F0-46ADDE664018} = {E645CC32-4823-463E-82F0-46ADDE664018}
+		{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} = {7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
 		{FAF46346-65CC-4DB2-85C4-B99826F79D0C} = {FAF46346-65CC-4DB2-85C4-B99826F79D0C}
 		{51FB3D48-2467-4BFA-A321-D848252B437E} = {51FB3D48-2467-4BFA-A321-D848252B437E}
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400} = {FFD3C64A-30E2-4BC7-BC8F-51818C320400}
@@ -153,6 +161,7 @@
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8} = {9C71A793-C177-4CAB-8EC5-923D500B39F8}
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8} = {F90BD995-FFA4-4B18-81E8-FA4322C939E8}
 		{BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23} = {BB6AA598-B336-4F8B-9DF9-8CAE7BE71C23}
+		{8154A59A-CAED-403D-AB94-BC4E7C032666} = {8154A59A-CAED-403D-AB94-BC4E7C032666}
 		{3648FB9A-C36F-43AB-AED0-1F1361E67FC7} = {3648FB9A-C36F-43AB-AED0-1F1361E67FC7}
 		{542A9FA1-B7FF-441C-AE15-054DB31D3488} = {542A9FA1-B7FF-441C-AE15-054DB31D3488}
 		{D8ABD6A5-1B36-4D62-934E-B5C6801130B0} = {D8ABD6A5-1B36-4D62-934E-B5C6801130B0}
@@ -164,6 +173,7 @@
 		{8B8D4FC3-3234-4E54-8376-5AB83D00D164} = {8B8D4FC3-3234-4E54-8376-5AB83D00D164}
 		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
 		{0112CAD5-3584-412A-A2E5-1315A00437B4} = {0112CAD5-3584-412A-A2E5-1315A00437B4}
+		{2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49} = {2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49}
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA} = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
 		{E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
 		{32CC75E2-EE85-45E6-8E3D-513F58464F43} = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
@@ -579,7 +589,9 @@
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.3D Plugin Release|Win32.ActiveCfg = Blender Release|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.3D Plugin Release|Win32.Build.0 = Blender Release|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{8154A59A-CAED-403D-AB94-BC4E7C032666}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{8154A59A-CAED-403D-AB94-BC4E7C032666}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
 		{8154A59A-CAED-403D-AB94-BC4E7C032666}.Debug|Win32.ActiveCfg = Blender Debug|Win32
@@ -591,7 +603,9 @@
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.BlenderPlayer Debug|Win32.ActiveCfg = BlenderPlayer Debug|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.BlenderPlayer Debug|Win32.Build.0 = BlenderPlayer Debug|Win32
 		{F90BD995-FFA4-4B18-81E8-FA4322C939E8}.BlenderPlayer Release|Win32.ActiveCfg = BlenderPlayer Release|Win32
@@ -605,7 +619,9 @@
 		{E645CC32-4823-463E-82F0-46ADDE664018}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{E645CC32-4823-463E-82F0-46ADDE664018}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{E645CC32-4823-463E-82F0-46ADDE664018}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.BlenderPlayer Debug|Win32.ActiveCfg = BlenderPlayer Debug|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.BlenderPlayer Debug|Win32.Build.0 = BlenderPlayer Debug|Win32
 		{E645CC32-4823-463E-82F0-46ADDE664018}.BlenderPlayer Release|Win32.ActiveCfg = BlenderPlayer Release|Win32
@@ -619,7 +635,9 @@
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.BlenderPlayer Debug|Win32.ActiveCfg = BlenderPlayer Debug|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.BlenderPlayer Debug|Win32.Build.0 = BlenderPlayer Debug|Win32
 		{6E24BF09-9653-4166-A871-F65CC9E98A9B}.BlenderPlayer Release|Win32.ActiveCfg = BlenderPlayer Release|Win32
@@ -633,7 +651,9 @@
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{6B801390-5F95-4F07-81A7-97FBA046AACC}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
+		{6B801390-5F95-4F07-81A7-97FBA046AACC}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.BlenderPlayer Debug|Win32.ActiveCfg = BlenderPlayer Debug|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.BlenderPlayer Debug|Win32.Build.0 = BlenderPlayer Debug|Win32
 		{6B801390-5F95-4F07-81A7-97FBA046AACC}.BlenderPlayer Release|Win32.ActiveCfg = BlenderPlayer Release|Win32
@@ -647,7 +667,9 @@
 		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E}.3D Plugin Release|Win32.ActiveCfg = 3D Plugin Release|Win32
 		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E}.3D Plugin Release|Win32.Build.0 = 3D Plugin Release|Win32
 		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E}.Blender Release|Win32.ActiveCfg = Blender Release|Win32

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list