[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21786] branches/bmesh/blender: merge with trunk at r21785, and also fixed stupid ngon normals bug
Joseph Eagar
joeedh at gmail.com
Wed Jul 22 04:57:42 CEST 2009
Revision: 21786
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21786
Author: joeedh
Date: 2009-07-22 04:57:40 +0200 (Wed, 22 Jul 2009)
Log Message:
-----------
merge with trunk at r21785, and also fixed stupid ngon normals bug
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/blenderplayer/CMakeLists.txt
branches/bmesh/blender/config/linux2-config.py
branches/bmesh/blender/config/win32-mingw-config.py
branches/bmesh/blender/config/win32-vc-config.py
branches/bmesh/blender/config/win64-vc-config.py
branches/bmesh/blender/extern/binreloc/CMakeLists.txt
branches/bmesh/blender/extern/binreloc/Makefile
branches/bmesh/blender/extern/bullet2/src/SConscript
branches/bmesh/blender/extern/ffmpeg/SConscript
branches/bmesh/blender/extern/libopenjpeg/SConscript
branches/bmesh/blender/intern/elbeem/SConscript
branches/bmesh/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/bmesh/blender/release/datafiles/preview.blend
branches/bmesh/blender/release/ui/buttons_data_armature.py
branches/bmesh/blender/release/ui/buttons_data_bone.py
branches/bmesh/blender/release/ui/buttons_data_lamp.py
branches/bmesh/blender/release/ui/buttons_data_lattice.py
branches/bmesh/blender/release/ui/buttons_data_mesh.py
branches/bmesh/blender/release/ui/buttons_data_modifier.py
branches/bmesh/blender/release/ui/buttons_material.py
branches/bmesh/blender/release/ui/buttons_object_constraint.py
branches/bmesh/blender/release/ui/buttons_objects.py
branches/bmesh/blender/release/ui/buttons_particle.py
branches/bmesh/blender/release/ui/buttons_physics_field.py
branches/bmesh/blender/release/ui/buttons_physics_fluid.py
branches/bmesh/blender/release/ui/buttons_physics_softbody.py
branches/bmesh/blender/release/ui/buttons_scene.py
branches/bmesh/blender/release/ui/buttons_texture.py
branches/bmesh/blender/release/ui/buttons_world.py
branches/bmesh/blender/release/ui/space_filebrowser.py
branches/bmesh/blender/release/ui/space_image.py
branches/bmesh/blender/release/ui/space_info.py
branches/bmesh/blender/release/ui/space_logic.py
branches/bmesh/blender/release/ui/space_outliner.py
branches/bmesh/blender/release/ui/space_sequencer.py
branches/bmesh/blender/release/ui/space_text.py
branches/bmesh/blender/release/ui/space_view3d.py
branches/bmesh/blender/release/ui/space_view3d_toolbar.py
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/blenkernel/BKE_action.h
branches/bmesh/blender/source/blender/blenkernel/BKE_animsys.h
branches/bmesh/blender/source/blender/blenkernel/BKE_colortools.h
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
branches/bmesh/blender/source/blender/blenkernel/BKE_property.h
branches/bmesh/blender/source/blender/blenkernel/BKE_report.h
branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/action.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/property.c
branches/bmesh/blender/source/blender/blenkernel/intern/report.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenkernel/intern/world.c
branches/bmesh/blender/source/blender/blenlib/BLI_arithb.h
branches/bmesh/blender/source/blender/blenlib/BLI_fileops.h
branches/bmesh/blender/source/blender/blenlib/BLI_kdtree.h
branches/bmesh/blender/source/blender/blenlib/BLI_util.h
branches/bmesh/blender/source/blender/blenlib/SConscript
branches/bmesh/blender/source/blender/blenlib/intern/BLI_kdtree.c
branches/bmesh/blender/source/blender/blenlib/intern/arithb.c
branches/bmesh/blender/source/blender/blenlib/intern/fileops.c
branches/bmesh/blender/source/blender/blenlib/intern/util.c
branches/bmesh/blender/source/blender/blenloader/CMakeLists.txt
branches/bmesh/blender/source/blender/blenloader/SConscript
branches/bmesh/blender/source/blender/blenloader/intern/Makefile
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/editors/Makefile
branches/bmesh/blender/source/blender/editors/SConscript
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_draw.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c
branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
branches/bmesh/blender/source/blender/editors/armature/poselib.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/curve_intern.h
branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/datafiles/B.blend.c
branches/bmesh/blender/source/blender/editors/datafiles/preview.blend.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c
branches/bmesh/blender/source/blender/editors/include/BIF_glutil.h
branches/bmesh/blender/source/blender/editors/include/ED_armature.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframes_draw.h
branches/bmesh/blender/source/blender/editors/include/ED_object.h
branches/bmesh/blender/source/blender/editors/include/ED_physics.h
branches/bmesh/blender/source/blender/editors/include/ED_previewrender.h
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_space_api.h
branches/bmesh/blender/source/blender/editors/include/ED_transform.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/interface/interface_style.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/interface/view2d.c
branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/object/editconstraint.c
branches/bmesh/blender/source/blender/editors/object/editgroup.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_intern.h
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/physics/ed_fluidsim.c
branches/bmesh/blender/source/blender/editors/physics/editparticle.c
branches/bmesh/blender/source/blender/editors/preview/previewrender.c
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/glutil.c
branches/bmesh/blender/source/blender/editors/screen/screen_context.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_ops.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_header.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/bmesh/blender/source/blender/editors/space_buttons/space_buttons.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_render.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_buttons.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_draw.c
branches/bmesh/blender/source/blender/editors/space_node/SConscript
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/bmesh/blender/source/blender/editors/space_text/space_text.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
branches/bmesh/blender/source/blender/imbuf/intern/divers.c
branches/bmesh/blender/source/blender/imbuf/intern/filter.c
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_armature_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_lamp_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_property_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_screen_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/RNA_enum_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/Makefile
branches/bmesh/blender/source/blender/makesrna/intern/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_brush.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_cloth.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_context.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_property.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_screen.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_vpaint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
branches/bmesh/blender/source/blender/nodes/CMakeLists.txt
branches/bmesh/blender/source/blender/nodes/SConscript
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/Makefile
branches/bmesh/blender/source/blender/nodes/intern/Makefile
branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/Makefile
branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/Makefile
branches/bmesh/blender/source/blender/python/SConscript
branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_ui.c
branches/bmesh/blender/source/blender/python/intern/bpy_util.c
branches/bmesh/blender/source/blender/python/intern/bpy_util.h
branches/bmesh/blender/source/blender/render/CMakeLists.txt
branches/bmesh/blender/source/blender/render/SConscript
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/include/shading.h
branches/bmesh/blender/source/blender/render/intern/source/Makefile
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
branches/bmesh/blender/source/blender/render/intern/source/sss.c
branches/bmesh/blender/source/blender/render/intern/source/strand.c
branches/bmesh/blender/source/blender/render/intern/source/texture.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_gesture.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/bmesh/blender/source/blender/windowmanager/wm.h
branches/bmesh/blender/source/blender/windowmanager/wm_event_types.h
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/bmesh/blender/source/gameengine/BlenderRoutines/SConscript
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Expressions/SConscript
branches/bmesh/blender/source/gameengine/GameLogic/CMakeLists.txt
branches/bmesh/blender/source/gameengine/GameLogic/SConscript
branches/bmesh/blender/source/gameengine/GamePlayer/common/SConscript
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/bmesh/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/bmesh/blender/source/gameengine/Ketsji/SConscript
branches/bmesh/blender/source/gameengine/Physics/Bullet/SConscript
branches/bmesh/blender/source/gameengine/Physics/common/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
branches/bmesh/blender/source/gameengine/SceneGraph/SConscript
branches/bmesh/blender/source/gameengine/VideoTexture/SConscript
branches/bmesh/blender/tools/Blender.py
Added Paths:
-----------
branches/bmesh/blender/release/ui/bpy_ops.py
branches/bmesh/blender/release/ui/buttons_game.py
branches/bmesh/blender/release/ui/buttons_physics_cloth.py
branches/bmesh/blender/release/ui/space_console.py
branches/bmesh/blender/release/windows/extra/python30.zip
branches/bmesh/blender/release/windows/extra/python31.zip
branches/bmesh/blender/source/blender/blenkernel/BKE_boids.h
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenlib/BLI_dlrbTree.h
branches/bmesh/blender/source/blender/blenlib/intern/DLRB_tree.c
branches/bmesh/blender/source/blender/editors/physics/physics_boids.c
branches/bmesh/blender/source/blender/editors/space_console/
branches/bmesh/blender/source/blender/editors/space_console/Makefile
branches/bmesh/blender/source/blender/editors/space_console/SConscript
branches/bmesh/blender/source/blender/editors/space_console/console_draw.c
branches/bmesh/blender/source/blender/editors/space_console/console_intern.h
branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
branches/bmesh/blender/source/blender/editors/space_console/console_report.c
branches/bmesh/blender/source/blender/editors/space_console/space_console.c
branches/bmesh/blender/source/blender/makesdna/DNA_boid_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_boid.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
Removed Paths:
-------------
branches/bmesh/blender/release/beos-4.5-i386/
branches/bmesh/blender/release/beos-5.0-i386/
branches/bmesh/blender/release/ui/buttons_physic_cloth.py
branches/bmesh/blender/source/blender/editors/space_console/Makefile
branches/bmesh/blender/source/blender/editors/space_console/SConscript
branches/bmesh/blender/source/blender/editors/space_console/console_draw.c
branches/bmesh/blender/source/blender/editors/space_console/console_intern.h
branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
branches/bmesh/blender/source/blender/editors/space_console/console_report.c
branches/bmesh/blender/source/blender/editors/space_console/space_console.c
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/CMakeLists.txt 2009-07-22 02:57:40 UTC (rev 21786)
@@ -63,6 +63,7 @@
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
+OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
@@ -133,9 +134,11 @@
SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
- FIND_PACKAGE(SDL)
- SET(SDL_INC ${SDL_INCLUDE_DIR})
- SET(SDL_LIB ${SDL_LIBRARY})
+ IF(WITH_SDL)
+ FIND_PACKAGE(SDL)
+ SET(SDL_INC ${SDL_INCLUDE_DIR})
+ SET(SDL_LIB ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
FIND_PATH(OPENEXR_INC
ImfXdr.h
Modified: branches/bmesh/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/blenderplayer/CMakeLists.txt 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/blenderplayer/CMakeLists.txt 2009-07-22 02:57:40 UTC (rev 21786)
@@ -32,10 +32,10 @@
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ADD_DEFINITIONS(-DWITH_BINRELOC)
INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c
Modified: branches/bmesh/blender/config/linux2-config.py
===================================================================
--- branches/bmesh/blender/config/linux2-config.py 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/config/linux2-config.py 2009-07-22 02:57:40 UTC (rev 21786)
@@ -1,17 +1,9 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
-def py_version_string():
- '''
- returns py version - "2.5", "2.6" etc
- '''
- import platform
- ver = platform.python_version_tuple()
- return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
-
BF_PYTHON = '/usr'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = py_version_string()
+BF_PYTHON_VERSION = '3.1'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: branches/bmesh/blender/config/win32-mingw-config.py
===================================================================
--- branches/bmesh/blender/config/win32-mingw-config.py 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/config/win32-mingw-config.py 2009-07-22 02:57:40 UTC (rev 21786)
@@ -2,7 +2,7 @@
LIBDIR = "${LCGDIR}"
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -148,7 +148,7 @@
BF_DEBUG = False
BF_DEBUG_CCFLAGS= ['-g']
-BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
BF_PROFILE_LINKFLAGS = ['-pg']
BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
BF_PROFILE = False
Modified: branches/bmesh/blender/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/config/win32-vc-config.py 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/config/win32-vc-config.py 2009-07-22 02:57:40 UTC (rev 21786)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
@@ -149,7 +149,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -165,7 +165,7 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:YES','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
# # Todo
# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
Modified: branches/bmesh/blender/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/config/win64-vc-config.py 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/config/win64-vc-config.py 2009-07-22 02:57:40 UTC (rev 21786)
@@ -9,10 +9,10 @@
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
+BF_PYTHON_VERSION = '3.1'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
+BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = False
@@ -152,7 +152,8 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -172,16 +173,13 @@
BF_DEBUG=False
BF_BSC=False
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
-CXXFLAGS = ['/EHsc']
if BF_DEBUG:
BF_NUMJOBS=1
else:
BF_NUMJOBS=6
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
BF_INSTALLDIR='..\\install\\blender25-win64-vc'
Modified: branches/bmesh/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/binreloc/CMakeLists.txt 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/extern/binreloc/CMakeLists.txt 2009-07-22 02:57:40 UTC (rev 21786)
@@ -18,8 +18,8 @@
# All rights reserved.
#
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
+SET(INC ./include )
+ADD_DEFINITIONS(-DENABLE_BINRELOC)
FILE(GLOB SRC *.c)
BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
Modified: branches/bmesh/blender/extern/binreloc/Makefile
===================================================================
--- branches/bmesh/blender/extern/binreloc/Makefile 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/extern/binreloc/Makefile 2009-07-22 02:57:40 UTC (rev 21786)
@@ -27,7 +27,7 @@
include nan_definitions.mk
-CPPFLAGS += -I./include
+CPPFLAGS += -DENABLE_BINRELOC -I./include
include nan_compile.mk
Modified: branches/bmesh/blender/extern/bullet2/src/SConscript
===================================================================
--- branches/bmesh/blender/extern/bullet2/src/SConscript 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/extern/bullet2/src/SConscript 2009-07-22 02:57:40 UTC (rev 21786)
@@ -10,7 +10,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3']
+ cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
elif env['OURPLATFORM']=='win32-mingw':
defs += ' NDEBUG'
cflags += ['-O2']
Modified: branches/bmesh/blender/extern/ffmpeg/SConscript
===================================================================
--- branches/bmesh/blender/extern/ffmpeg/SConscript 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/extern/ffmpeg/SConscript 2009-07-22 02:57:40 UTC (rev 21786)
@@ -148,7 +148,7 @@
break
sources.append(s)
- if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+ if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc', 'win64-vc' , 'darwin'] :
defs = "HAVE_AV_CONFIG_H _ISOC9X_SOURCE"
else :
defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
Modified: branches/bmesh/blender/extern/libopenjpeg/SConscript
===================================================================
--- branches/bmesh/blender/extern/libopenjpeg/SConscript 2009-07-22 00:51:13 UTC (rev 21785)
+++ branches/bmesh/blender/extern/libopenjpeg/SConscript 2009-07-22 02:57:40 UTC (rev 21786)
@@ -10,14 +10,14 @@
flags = []
defs = []
-if env['OURPLATFORM'] == 'win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
flags = []
defs.append('OPJ_STATIC')
else:
flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
oj_env = env.Clone()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list