[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40843] branches/carve_booleans: svn merge ^/trunk/blender -r40000:40500
Campbell Barton
ideasman42 at gmail.com
Fri Oct 7 08:21:56 CEST 2011
Revision: 40843
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40843
Author: campbellbarton
Date: 2011-10-07 06:21:55 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40000:40500
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40000
Modified Paths:
--------------
branches/carve_booleans/CMakeLists.txt
branches/carve_booleans/GNUmakefile
branches/carve_booleans/SConstruct
branches/carve_booleans/build_files/buildbot/config/user-config-i686.py
branches/carve_booleans/build_files/buildbot/config/user-config-player-i686.py
branches/carve_booleans/build_files/buildbot/config/user-config-player-x86_64.py
branches/carve_booleans/build_files/buildbot/config/user-config-x86_64.py
branches/carve_booleans/build_files/buildbot/master_unpack.py
branches/carve_booleans/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/carve_booleans/build_files/cmake/macros.cmake
branches/carve_booleans/build_files/scons/config/darwin-config.py
branches/carve_booleans/build_files/scons/config/irix6-config.py
branches/carve_booleans/build_files/scons/config/linuxcross-config.py
branches/carve_booleans/build_files/scons/config/win64-vc-config.py
branches/carve_booleans/build_files/scons/tools/Blender.py
branches/carve_booleans/build_files/scons/tools/btools.py
branches/carve_booleans/doc/manpage/blender.1
branches/carve_booleans/doc/python_api/examples/bge.texture.1.py
branches/carve_booleans/doc/python_api/examples/bpy.types.ID.user_clear.1.py
branches/carve_booleans/doc/python_api/examples/bpy.types.Operator.py
branches/carve_booleans/doc/python_api/rst/info_gotcha.rst
branches/carve_booleans/doc/python_api/rst/info_quickstart.rst
branches/carve_booleans/doc/python_api/rst/info_tips_and_tricks.rst
branches/carve_booleans/doc/python_api/sphinx_doc_gen.py
branches/carve_booleans/doc/python_api/sphinx_doc_gen.sh
branches/carve_booleans/extern/CMakeLists.txt
branches/carve_booleans/extern/SConscript
branches/carve_booleans/extern/eltopo/common/bfstream.h
branches/carve_booleans/extern/glew/include/GL/glew.h
branches/carve_booleans/extern/glew/include/GL/glxew.h
branches/carve_booleans/extern/glew/include/GL/wglew.h
branches/carve_booleans/extern/glew/src/glew.c
branches/carve_booleans/intern/audaspace/CMakeLists.txt
branches/carve_booleans/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/carve_booleans/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/carve_booleans/intern/audaspace/intern/AUD_Mixer.cpp
branches/carve_booleans/intern/audaspace/intern/AUD_SequencerHandle.cpp
branches/carve_booleans/intern/audaspace/intern/AUD_SequencerHandle.h
branches/carve_booleans/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/carve_booleans/intern/elbeem/CMakeLists.txt
branches/carve_booleans/intern/elbeem/intern/loop_tools.h
branches/carve_booleans/intern/ghost/SConscript
branches/carve_booleans/intern/ghost/intern/GHOST_SystemX11.cpp
branches/carve_booleans/intern/guardedalloc/MEM_sys_types.h
branches/carve_booleans/intern/guardedalloc/intern/mallocn.c
branches/carve_booleans/intern/itasc/kdl/frames.hpp
branches/carve_booleans/intern/opennl/superlu/superlu_sys_types.h
branches/carve_booleans/intern/smoke/CMakeLists.txt
branches/carve_booleans/intern/string/intern/STR_String.cpp
branches/carve_booleans/intern/tools/credits_svn_gen.py
branches/carve_booleans/intern/tools/pydna.py
branches/carve_booleans/po/ar.po
branches/carve_booleans/po/bg.po
branches/carve_booleans/po/ca.po
branches/carve_booleans/po/cs.po
branches/carve_booleans/po/de.po
branches/carve_booleans/po/el.po
branches/carve_booleans/po/es.po
branches/carve_booleans/po/fi.po
branches/carve_booleans/po/fr.po
branches/carve_booleans/po/hr.po
branches/carve_booleans/po/it.po
branches/carve_booleans/po/ja.po
branches/carve_booleans/po/ko.po
branches/carve_booleans/po/nl.po
branches/carve_booleans/po/pl.po
branches/carve_booleans/po/pt_BR.po
branches/carve_booleans/po/ro.po
branches/carve_booleans/po/ru.po
branches/carve_booleans/po/sr.po
branches/carve_booleans/po/sr at Latn.po
branches/carve_booleans/po/sv.po
branches/carve_booleans/po/uk.po
branches/carve_booleans/po/zh_CN.po
branches/carve_booleans/release/bin/.blender/.Blanguages
branches/carve_booleans/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/carve_booleans/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/carve_booleans/release/scripts/modules/addon_utils.py
branches/carve_booleans/release/scripts/modules/bpy/utils.py
branches/carve_booleans/release/scripts/modules/bpy_extras/__init__.py
branches/carve_booleans/release/scripts/modules/bpy_extras/io_utils.py
branches/carve_booleans/release/scripts/modules/bpy_types.py
branches/carve_booleans/release/scripts/modules/console_python.py
branches/carve_booleans/release/scripts/modules/rna_info.py
branches/carve_booleans/release/scripts/startup/bl_operators/__init__.py
branches/carve_booleans/release/scripts/startup/bl_operators/animsys_update.py
branches/carve_booleans/release/scripts/startup/bl_operators/image.py
branches/carve_booleans/release/scripts/startup/bl_operators/mesh.py
branches/carve_booleans/release/scripts/startup/bl_operators/object.py
branches/carve_booleans/release/scripts/startup/bl_operators/object_quick_effects.py
branches/carve_booleans/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/carve_booleans/release/scripts/startup/bl_operators/sequencer.py
branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/carve_booleans/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/carve_booleans/release/scripts/startup/bl_operators/wm.py
branches/carve_booleans/release/scripts/startup/bl_ui/__init__.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_armature.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_curve.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_game.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_material.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_particle.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_field.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_render.py
branches/carve_booleans/release/scripts/startup/bl_ui/properties_scene.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_console.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_image.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_info.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_sequencer.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_text.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d.py
branches/carve_booleans/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/carve_booleans/release/scripts/templates/operator_export.py
branches/carve_booleans/source/blender/avi/intern/avirgb.c
branches/carve_booleans/source/blender/avi/intern/endian.c
branches/carve_booleans/source/blender/blenfont/BLF_api.h
branches/carve_booleans/source/blender/blenfont/CMakeLists.txt
branches/carve_booleans/source/blender/blenfont/SConscript
branches/carve_booleans/source/blender/blenfont/intern/blf.c
branches/carve_booleans/source/blender/blenfont/intern/blf_dir.c
branches/carve_booleans/source/blender/blenfont/intern/blf_font.c
branches/carve_booleans/source/blender/blenfont/intern/blf_glyph.c
branches/carve_booleans/source/blender/blenfont/intern/blf_internal.h
branches/carve_booleans/source/blender/blenfont/intern/blf_internal_types.h
branches/carve_booleans/source/blender/blenfont/intern/blf_lang.c
branches/carve_booleans/source/blender/blenfont/intern/blf_util.c
branches/carve_booleans/source/blender/blenkernel/BKE_armature.h
branches/carve_booleans/source/blender/blenkernel/BKE_blender.h
branches/carve_booleans/source/blender/blenkernel/BKE_colortools.h
branches/carve_booleans/source/blender/blenkernel/BKE_curve.h
branches/carve_booleans/source/blender/blenkernel/BKE_global.h
branches/carve_booleans/source/blender/blenkernel/BKE_image.h
branches/carve_booleans/source/blender/blenkernel/BKE_material.h
branches/carve_booleans/source/blender/blenkernel/BKE_mesh.h
branches/carve_booleans/source/blender/blenkernel/BKE_object.h
branches/carve_booleans/source/blender/blenkernel/BKE_paint.h
branches/carve_booleans/source/blender/blenkernel/BKE_sequencer.h
branches/carve_booleans/source/blender/blenkernel/BKE_utildefines.h
branches/carve_booleans/source/blender/blenkernel/CMakeLists.txt
branches/carve_booleans/source/blender/blenkernel/SConscript
branches/carve_booleans/source/blender/blenkernel/intern/DerivedMesh.c
branches/carve_booleans/source/blender/blenkernel/intern/action.c
branches/carve_booleans/source/blender/blenkernel/intern/anim.c
branches/carve_booleans/source/blender/blenkernel/intern/anim_sys.c
branches/carve_booleans/source/blender/blenkernel/intern/armature.c
branches/carve_booleans/source/blender/blenkernel/intern/blender.c
branches/carve_booleans/source/blender/blenkernel/intern/boids.c
branches/carve_booleans/source/blender/blenkernel/intern/brush.c
branches/carve_booleans/source/blender/blenkernel/intern/cdderivedmesh.c
branches/carve_booleans/source/blender/blenkernel/intern/collision.c
branches/carve_booleans/source/blender/blenkernel/intern/colortools.c
branches/carve_booleans/source/blender/blenkernel/intern/constraint.c
branches/carve_booleans/source/blender/blenkernel/intern/curve.c
branches/carve_booleans/source/blender/blenkernel/intern/customdata.c
branches/carve_booleans/source/blender/blenkernel/intern/displist.c
branches/carve_booleans/source/blender/blenkernel/intern/effect.c
branches/carve_booleans/source/blender/blenkernel/intern/image.c
branches/carve_booleans/source/blender/blenkernel/intern/ipo.c
branches/carve_booleans/source/blender/blenkernel/intern/key.c
branches/carve_booleans/source/blender/blenkernel/intern/material.c
branches/carve_booleans/source/blender/blenkernel/intern/mesh.c
branches/carve_booleans/source/blender/blenkernel/intern/mesh_validate.c
branches/carve_booleans/source/blender/blenkernel/intern/multires.c
branches/carve_booleans/source/blender/blenkernel/intern/node.c
branches/carve_booleans/source/blender/blenkernel/intern/object.c
branches/carve_booleans/source/blender/blenkernel/intern/paint.c
branches/carve_booleans/source/blender/blenkernel/intern/particle.c
branches/carve_booleans/source/blender/blenkernel/intern/sca.c
branches/carve_booleans/source/blender/blenkernel/intern/scene.c
branches/carve_booleans/source/blender/blenkernel/intern/screen.c
branches/carve_booleans/source/blender/blenkernel/intern/seqeffects.c
branches/carve_booleans/source/blender/blenkernel/intern/sequencer.c
branches/carve_booleans/source/blender/blenkernel/intern/shrinkwrap.c
branches/carve_booleans/source/blender/blenkernel/intern/sketch.c
branches/carve_booleans/source/blender/blenkernel/intern/sound.c
branches/carve_booleans/source/blender/blenkernel/intern/subsurf_ccg.c
branches/carve_booleans/source/blender/blenkernel/intern/unit.c
branches/carve_booleans/source/blender/blenlib/BLI_fileops.h
branches/carve_booleans/source/blender/blenlib/BLI_math_inline.h
branches/carve_booleans/source/blender/blenlib/BLI_math_matrix.h
branches/carve_booleans/source/blender/blenlib/BLI_math_rotation.h
branches/carve_booleans/source/blender/blenlib/BLI_math_vector.h
branches/carve_booleans/source/blender/blenlib/BLI_string.h
branches/carve_booleans/source/blender/blenlib/BLI_utildefines.h
branches/carve_booleans/source/blender/blenlib/BLI_voxel.h
branches/carve_booleans/source/blender/blenlib/CMakeLists.txt
branches/carve_booleans/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/carve_booleans/source/blender/blenlib/intern/fileops.c
branches/carve_booleans/source/blender/blenlib/intern/graph.c
branches/carve_booleans/source/blender/blenlib/intern/math_matrix.c
branches/carve_booleans/source/blender/blenlib/intern/math_rotation.c
branches/carve_booleans/source/blender/blenlib/intern/math_vector_inline.c
branches/carve_booleans/source/blender/blenlib/intern/path_util.c
branches/carve_booleans/source/blender/blenlib/intern/storage.c
branches/carve_booleans/source/blender/blenlib/intern/string.c
branches/carve_booleans/source/blender/blenlib/intern/threads.c
branches/carve_booleans/source/blender/blenlib/intern/voxel.c
branches/carve_booleans/source/blender/blenloader/BLO_sys_types.h
branches/carve_booleans/source/blender/blenloader/intern/readfile.c
branches/carve_booleans/source/blender/blenloader/intern/writefile.c
branches/carve_booleans/source/blender/collada/AnimationExporter.cpp
branches/carve_booleans/source/blender/collada/AnimationImporter.cpp
branches/carve_booleans/source/blender/collada/ArmatureExporter.cpp
branches/carve_booleans/source/blender/collada/ArmatureExporter.h
branches/carve_booleans/source/blender/collada/ArmatureImporter.cpp
branches/carve_booleans/source/blender/collada/CMakeLists.txt
branches/carve_booleans/source/blender/collada/CameraExporter.cpp
branches/carve_booleans/source/blender/collada/CameraExporter.h
branches/carve_booleans/source/blender/collada/DocumentExporter.cpp
branches/carve_booleans/source/blender/collada/DocumentExporter.h
branches/carve_booleans/source/blender/collada/DocumentImporter.cpp
branches/carve_booleans/source/blender/collada/EffectExporter.cpp
branches/carve_booleans/source/blender/collada/EffectExporter.h
branches/carve_booleans/source/blender/collada/ErrorHandler.cpp
branches/carve_booleans/source/blender/collada/GeometryExporter.cpp
branches/carve_booleans/source/blender/collada/GeometryExporter.h
branches/carve_booleans/source/blender/collada/ImageExporter.cpp
branches/carve_booleans/source/blender/collada/ImageExporter.h
branches/carve_booleans/source/blender/collada/LightExporter.cpp
branches/carve_booleans/source/blender/collada/LightExporter.h
branches/carve_booleans/source/blender/collada/MaterialExporter.cpp
branches/carve_booleans/source/blender/collada/MaterialExporter.h
branches/carve_booleans/source/blender/collada/MeshImporter.cpp
branches/carve_booleans/source/blender/collada/MeshImporter.h
branches/carve_booleans/source/blender/collada/SceneExporter.cpp
branches/carve_booleans/source/blender/collada/SceneExporter.h
branches/carve_booleans/source/blender/collada/TransformReader.cpp
branches/carve_booleans/source/blender/collada/TransformWriter.cpp
branches/carve_booleans/source/blender/collada/collada.cpp
branches/carve_booleans/source/blender/editors/animation/anim_channels_defines.c
branches/carve_booleans/source/blender/editors/animation/anim_draw.c
branches/carve_booleans/source/blender/editors/animation/anim_filter.c
branches/carve_booleans/source/blender/editors/animation/drivers.c
branches/carve_booleans/source/blender/editors/animation/fmodifier_ui.c
branches/carve_booleans/source/blender/editors/animation/keyframes_edit.c
branches/carve_booleans/source/blender/editors/animation/keyframes_general.c
branches/carve_booleans/source/blender/editors/animation/keyframing.c
branches/carve_booleans/source/blender/editors/animation/keyingsets.c
branches/carve_booleans/source/blender/editors/armature/CMakeLists.txt
branches/carve_booleans/source/blender/editors/armature/SConscript
branches/carve_booleans/source/blender/editors/armature/armature_ops.c
branches/carve_booleans/source/blender/editors/armature/editarmature.c
branches/carve_booleans/source/blender/editors/armature/editarmature_sketch.c
branches/carve_booleans/source/blender/editors/armature/meshlaplacian.c
branches/carve_booleans/source/blender/editors/armature/poseSlide.c
branches/carve_booleans/source/blender/editors/armature/poselib.c
branches/carve_booleans/source/blender/editors/armature/poseobject.c
branches/carve_booleans/source/blender/editors/curve/curve_ops.c
branches/carve_booleans/source/blender/editors/curve/editcurve.c
branches/carve_booleans/source/blender/editors/curve/editfont.c
branches/carve_booleans/source/blender/editors/gpencil/gpencil_edit.c
branches/carve_booleans/source/blender/editors/gpencil/gpencil_paint.c
branches/carve_booleans/source/blender/editors/include/ED_armature.h
branches/carve_booleans/source/blender/editors/include/ED_curve.h
branches/carve_booleans/source/blender/editors/include/ED_mesh.h
branches/carve_booleans/source/blender/editors/include/ED_object.h
branches/carve_booleans/source/blender/editors/include/ED_sculpt.h
branches/carve_booleans/source/blender/editors/include/ED_view3d.h
branches/carve_booleans/source/blender/editors/include/UI_interface.h
branches/carve_booleans/source/blender/editors/include/UI_resources.h
branches/carve_booleans/source/blender/editors/interface/interface.c
branches/carve_booleans/source/blender/editors/interface/interface_draw.c
branches/carve_booleans/source/blender/editors/interface/interface_handlers.c
branches/carve_booleans/source/blender/editors/interface/interface_intern.h
branches/carve_booleans/source/blender/editors/interface/interface_layout.c
branches/carve_booleans/source/blender/editors/interface/interface_ops.c
branches/carve_booleans/source/blender/editors/interface/interface_panel.c
branches/carve_booleans/source/blender/editors/interface/interface_regions.c
branches/carve_booleans/source/blender/editors/interface/interface_style.c
branches/carve_booleans/source/blender/editors/interface/interface_templates.c
branches/carve_booleans/source/blender/editors/interface/interface_utils.c
branches/carve_booleans/source/blender/editors/interface/interface_widgets.c
branches/carve_booleans/source/blender/editors/interface/resources.c
branches/carve_booleans/source/blender/editors/interface/view2d.c
branches/carve_booleans/source/blender/editors/interface/view2d_ops.c
branches/carve_booleans/source/blender/editors/mesh/editmesh.c
branches/carve_booleans/source/blender/editors/mesh/editmesh_add.c
branches/carve_booleans/source/blender/editors/mesh/editmesh_lib.c
branches/carve_booleans/source/blender/editors/mesh/editmesh_mods.c
branches/carve_booleans/source/blender/editors/mesh/editmesh_tools.c
branches/carve_booleans/source/blender/editors/mesh/mesh_data.c
branches/carve_booleans/source/blender/editors/mesh/meshtools.c
branches/carve_booleans/source/blender/editors/metaball/mball_edit.c
branches/carve_booleans/source/blender/editors/object/CMakeLists.txt
branches/carve_booleans/source/blender/editors/object/SConscript
branches/carve_booleans/source/blender/editors/object/object_add.c
branches/carve_booleans/source/blender/editors/object/object_constraint.c
branches/carve_booleans/source/blender/editors/object/object_edit.c
branches/carve_booleans/source/blender/editors/object/object_hook.c
branches/carve_booleans/source/blender/editors/object/object_intern.h
branches/carve_booleans/source/blender/editors/object/object_modifier.c
branches/carve_booleans/source/blender/editors/object/object_ops.c
branches/carve_booleans/source/blender/editors/object/object_relations.c
branches/carve_booleans/source/blender/editors/object/object_select.c
branches/carve_booleans/source/blender/editors/object/object_shapekey.c
branches/carve_booleans/source/blender/editors/object/object_transform.c
branches/carve_booleans/source/blender/editors/object/object_vgroup.c
branches/carve_booleans/source/blender/editors/physics/particle_edit.c
branches/carve_booleans/source/blender/editors/physics/physics_fluid.c
branches/carve_booleans/source/blender/editors/render/render_internal.c
branches/carve_booleans/source/blender/editors/render/render_opengl.c
branches/carve_booleans/source/blender/editors/render/render_shading.c
branches/carve_booleans/source/blender/editors/screen/area.c
branches/carve_booleans/source/blender/editors/screen/glutil.c
branches/carve_booleans/source/blender/editors/screen/screen_context.c
branches/carve_booleans/source/blender/editors/screen/screen_ops.c
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_image.c
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_intern.h
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_ops.c
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_stroke.c
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_utils.c
branches/carve_booleans/source/blender/editors/sculpt_paint/paint_vertex.c
branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt.c
branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/carve_booleans/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/carve_booleans/source/blender/editors/sound/sound_intern.h
branches/carve_booleans/source/blender/editors/sound/sound_ops.c
branches/carve_booleans/source/blender/editors/space_action/action_draw.c
branches/carve_booleans/source/blender/editors/space_action/action_edit.c
branches/carve_booleans/source/blender/editors/space_action/action_ops.c
branches/carve_booleans/source/blender/editors/space_action/action_select.c
branches/carve_booleans/source/blender/editors/space_buttons/CMakeLists.txt
branches/carve_booleans/source/blender/editors/space_buttons/SConscript
branches/carve_booleans/source/blender/editors/space_buttons/buttons_header.c
branches/carve_booleans/source/blender/editors/space_console/console_ops.c
branches/carve_booleans/source/blender/editors/space_console/space_console.c
branches/carve_booleans/source/blender/editors/space_file/file_draw.c
branches/carve_booleans/source/blender/editors/space_file/file_ops.c
branches/carve_booleans/source/blender/editors/space_file/file_panels.c
branches/carve_booleans/source/blender/editors/space_file/filelist.c
branches/carve_booleans/source/blender/editors/space_file/filesel.c
branches/carve_booleans/source/blender/editors/space_graph/CMakeLists.txt
branches/carve_booleans/source/blender/editors/space_graph/SConscript
branches/carve_booleans/source/blender/editors/space_graph/graph_buttons.c
branches/carve_booleans/source/blender/editors/space_graph/graph_edit.c
branches/carve_booleans/source/blender/editors/space_graph/graph_ops.c
branches/carve_booleans/source/blender/editors/space_graph/graph_select.c
branches/carve_booleans/source/blender/editors/space_image/image_buttons.c
branches/carve_booleans/source/blender/editors/space_image/image_ops.c
branches/carve_booleans/source/blender/editors/space_image/space_image.c
branches/carve_booleans/source/blender/editors/space_info/info_ops.c
branches/carve_booleans/source/blender/editors/space_info/info_report.c
branches/carve_booleans/source/blender/editors/space_info/info_stats.c
branches/carve_booleans/source/blender/editors/space_info/space_info.c
branches/carve_booleans/source/blender/editors/space_logic/CMakeLists.txt
branches/carve_booleans/source/blender/editors/space_logic/logic_ops.c
branches/carve_booleans/source/blender/editors/space_logic/logic_window.c
branches/carve_booleans/source/blender/editors/space_nla/CMakeLists.txt
branches/carve_booleans/source/blender/editors/space_nla/SConscript
branches/carve_booleans/source/blender/editors/space_nla/nla_buttons.c
branches/carve_booleans/source/blender/editors/space_nla/nla_channels.c
branches/carve_booleans/source/blender/editors/space_nla/nla_draw.c
branches/carve_booleans/source/blender/editors/space_nla/nla_edit.c
branches/carve_booleans/source/blender/editors/space_nla/nla_select.c
branches/carve_booleans/source/blender/editors/space_node/drawnode.c
branches/carve_booleans/source/blender/editors/space_node/node_draw.c
branches/carve_booleans/source/blender/editors/space_node/node_edit.c
branches/carve_booleans/source/blender/editors/space_node/node_header.c
branches/carve_booleans/source/blender/editors/space_node/node_ops.c
branches/carve_booleans/source/blender/editors/space_node/node_select.c
branches/carve_booleans/source/blender/editors/space_node/node_state.c
branches/carve_booleans/source/blender/editors/space_node/space_node.c
branches/carve_booleans/source/blender/editors/space_outliner/outliner_draw.c
branches/carve_booleans/source/blender/editors/space_outliner/outliner_edit.c
branches/carve_booleans/source/blender/editors/space_outliner/outliner_intern.h
branches/carve_booleans/source/blender/editors/space_outliner/outliner_select.c
branches/carve_booleans/source/blender/editors/space_outliner/outliner_tools.c
branches/carve_booleans/source/blender/editors/space_outliner/outliner_tree.c
branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_add.c
branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_draw.c
branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_edit.c
branches/carve_booleans/source/blender/editors/space_sequencer/sequencer_select.c
branches/carve_booleans/source/blender/editors/space_sequencer/space_sequencer.c
branches/carve_booleans/source/blender/editors/space_text/text_draw.c
branches/carve_booleans/source/blender/editors/space_text/text_ops.c
branches/carve_booleans/source/blender/editors/space_view3d/drawarmature.c
branches/carve_booleans/source/blender/editors/space_view3d/drawmesh.c
branches/carve_booleans/source/blender/editors/space_view3d/drawobject.c
branches/carve_booleans/source/blender/editors/space_view3d/drawvolume.c
branches/carve_booleans/source/blender/editors/space_view3d/space_view3d.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_buttons.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_draw.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_edit.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_header.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_select.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_snap.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_toolbar.c
branches/carve_booleans/source/blender/editors/space_view3d/view3d_view.c
branches/carve_booleans/source/blender/editors/transform/CMakeLists.txt
branches/carve_booleans/source/blender/editors/transform/SConscript
branches/carve_booleans/source/blender/editors/transform/transform.c
branches/carve_booleans/source/blender/editors/transform/transform_constraints.c
branches/carve_booleans/source/blender/editors/transform/transform_conversions.c
branches/carve_booleans/source/blender/editors/transform/transform_generics.c
branches/carve_booleans/source/blender/editors/transform/transform_manipulator.c
branches/carve_booleans/source/blender/editors/transform/transform_ops.c
branches/carve_booleans/source/blender/editors/transform/transform_orientations.c
branches/carve_booleans/source/blender/editors/transform/transform_snap.c
branches/carve_booleans/source/blender/editors/util/SConscript
branches/carve_booleans/source/blender/editors/uvedit/uvedit_draw.c
branches/carve_booleans/source/blender/editors/uvedit/uvedit_ops.c
branches/carve_booleans/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/carve_booleans/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/carve_booleans/source/blender/gpu/GPU_draw.h
branches/carve_booleans/source/blender/gpu/GPU_extensions.h
branches/carve_booleans/source/blender/gpu/GPU_material.h
branches/carve_booleans/source/blender/gpu/intern/gpu_buffers.c
branches/carve_booleans/source/blender/gpu/intern/gpu_codegen.c
branches/carve_booleans/source/blender/gpu/intern/gpu_codegen.h
branches/carve_booleans/source/blender/gpu/intern/gpu_draw.c
branches/carve_booleans/source/blender/gpu/intern/gpu_extensions.c
branches/carve_booleans/source/blender/gpu/intern/gpu_material.c
branches/carve_booleans/source/blender/gpu/intern/gpu_shader_material.glsl
branches/carve_booleans/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/carve_booleans/source/blender/imbuf/CMakeLists.txt
branches/carve_booleans/source/blender/imbuf/SConscript
branches/carve_booleans/source/blender/imbuf/intern/IMB_anim.h
branches/carve_booleans/source/blender/imbuf/intern/IMB_indexer.h
branches/carve_booleans/source/blender/imbuf/intern/anim_movie.c
branches/carve_booleans/source/blender/imbuf/intern/filter.c
branches/carve_booleans/source/blender/imbuf/intern/imbuf.h
branches/carve_booleans/source/blender/imbuf/intern/indexer.c
branches/carve_booleans/source/blender/imbuf/intern/iris.c
branches/carve_booleans/source/blender/imbuf/intern/jp2.c
branches/carve_booleans/source/blender/imbuf/intern/jpeg.c
branches/carve_booleans/source/blender/imbuf/intern/md5.c
branches/carve_booleans/source/blender/imbuf/intern/radiance_hdr.c
branches/carve_booleans/source/blender/imbuf/intern/tiff.c
branches/carve_booleans/source/blender/makesdna/DNA_ID.h
branches/carve_booleans/source/blender/makesdna/DNA_action_types.h
branches/carve_booleans/source/blender/makesdna/DNA_actuator_types.h
branches/carve_booleans/source/blender/makesdna/DNA_customdata_types.h
branches/carve_booleans/source/blender/makesdna/DNA_material_types.h
branches/carve_booleans/source/blender/makesdna/DNA_mesh_types.h
branches/carve_booleans/source/blender/makesdna/DNA_meshdata_types.h
branches/carve_booleans/source/blender/makesdna/DNA_modifier_types.h
branches/carve_booleans/source/blender/makesdna/DNA_node_types.h
branches/carve_booleans/source/blender/makesdna/DNA_object_types.h
branches/carve_booleans/source/blender/makesdna/DNA_outliner_types.h
branches/carve_booleans/source/blender/makesdna/DNA_scene_types.h
branches/carve_booleans/source/blender/makesdna/DNA_sequence_types.h
branches/carve_booleans/source/blender/makesdna/DNA_space_types.h
branches/carve_booleans/source/blender/makesdna/DNA_userdef_types.h
branches/carve_booleans/source/blender/makesrna/RNA_access.h
branches/carve_booleans/source/blender/makesrna/RNA_define.h
branches/carve_booleans/source/blender/makesrna/RNA_types.h
branches/carve_booleans/source/blender/makesrna/SConscript
branches/carve_booleans/source/blender/makesrna/intern/CMakeLists.txt
branches/carve_booleans/source/blender/makesrna/intern/SConscript
branches/carve_booleans/source/blender/makesrna/intern/makesrna.c
branches/carve_booleans/source/blender/makesrna/intern/rna_ID.c
branches/carve_booleans/source/blender/makesrna/intern/rna_access.c
branches/carve_booleans/source/blender/makesrna/intern/rna_action.c
branches/carve_booleans/source/blender/makesrna/intern/rna_actuator.c
branches/carve_booleans/source/blender/makesrna/intern/rna_actuator_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_animation.c
branches/carve_booleans/source/blender/makesrna/intern/rna_armature.c
branches/carve_booleans/source/blender/makesrna/intern/rna_armature_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_color.c
branches/carve_booleans/source/blender/makesrna/intern/rna_constraint.c
branches/carve_booleans/source/blender/makesrna/intern/rna_controller_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_curve.c
branches/carve_booleans/source/blender/makesrna/intern/rna_define.c
branches/carve_booleans/source/blender/makesrna/intern/rna_fcurve.c
branches/carve_booleans/source/blender/makesrna/intern/rna_gpencil.c
branches/carve_booleans/source/blender/makesrna/intern/rna_group.c
branches/carve_booleans/source/blender/makesrna/intern/rna_image_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_key.c
branches/carve_booleans/source/blender/makesrna/intern/rna_main.c
branches/carve_booleans/source/blender/makesrna/intern/rna_main_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_material.c
branches/carve_booleans/source/blender/makesrna/intern/rna_mesh.c
branches/carve_booleans/source/blender/makesrna/intern/rna_mesh_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_meta.c
branches/carve_booleans/source/blender/makesrna/intern/rna_modifier.c
branches/carve_booleans/source/blender/makesrna/intern/rna_nla.c
branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree.c
branches/carve_booleans/source/blender/makesrna/intern/rna_object.c
branches/carve_booleans/source/blender/makesrna/intern/rna_object_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_object_force.c
branches/carve_booleans/source/blender/makesrna/intern/rna_pose.c
branches/carve_booleans/source/blender/makesrna/intern/rna_pose_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_property.c
branches/carve_booleans/source/blender/makesrna/intern/rna_render.c
branches/carve_booleans/source/blender/makesrna/intern/rna_rna.c
branches/carve_booleans/source/blender/makesrna/intern/rna_scene.c
branches/carve_booleans/source/blender/makesrna/intern/rna_scene_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_screen.c
branches/carve_booleans/source/blender/makesrna/intern/rna_sensor_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_sequencer.c
branches/carve_booleans/source/blender/makesrna/intern/rna_sequencer_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_smoke.c
branches/carve_booleans/source/blender/makesrna/intern/rna_sound.c
branches/carve_booleans/source/blender/makesrna/intern/rna_space.c
branches/carve_booleans/source/blender/makesrna/intern/rna_speaker.c
branches/carve_booleans/source/blender/makesrna/intern/rna_text.c
branches/carve_booleans/source/blender/makesrna/intern/rna_text_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_texture.c
branches/carve_booleans/source/blender/makesrna/intern/rna_texture_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_ui.c
branches/carve_booleans/source/blender/makesrna/intern/rna_ui_api.c
branches/carve_booleans/source/blender/makesrna/intern/rna_userdef.c
branches/carve_booleans/source/blender/makesrna/intern/rna_wm.c
branches/carve_booleans/source/blender/makesrna/intern/rna_wm_api.c
branches/carve_booleans/source/blender/modifiers/CMakeLists.txt
branches/carve_booleans/source/blender/modifiers/MOD_modifiertypes.h
branches/carve_booleans/source/blender/modifiers/SConscript
branches/carve_booleans/source/blender/modifiers/intern/MOD_solidify.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_util.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_uvproject.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_warp.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/carve_booleans/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/carve_booleans/source/blender/nodes/composite/node_composite_tree.c
branches/carve_booleans/source/blender/nodes/composite/node_composite_util.h
branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/carve_booleans/source/blender/nodes/intern/node_common.c
branches/carve_booleans/source/blender/nodes/intern/node_util.h
branches/carve_booleans/source/blender/nodes/shader/node_shader_tree.c
branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_material.c
branches/carve_booleans/source/blender/python/SConscript
branches/carve_booleans/source/blender/python/generic/CMakeLists.txt
branches/carve_booleans/source/blender/python/generic/bgl.c
branches/carve_booleans/source/blender/python/generic/blf_py_api.c
branches/carve_booleans/source/blender/python/generic/py_capi_utils.c
branches/carve_booleans/source/blender/python/generic/py_capi_utils.h
branches/carve_booleans/source/blender/python/intern/CMakeLists.txt
branches/carve_booleans/source/blender/python/intern/bpy.h
branches/carve_booleans/source/blender/python/intern/bpy_app_handlers.c
branches/carve_booleans/source/blender/python/intern/bpy_interface.c
branches/carve_booleans/source/blender/python/intern/bpy_props.c
branches/carve_booleans/source/blender/python/intern/bpy_rna.c
branches/carve_booleans/source/blender/python/mathutils/mathutils_Euler.c
branches/carve_booleans/source/blender/python/mathutils/mathutils_Matrix.c
branches/carve_booleans/source/blender/python/mathutils/mathutils_Quaternion.c
branches/carve_booleans/source/blender/python/mathutils/mathutils_Vector.c
branches/carve_booleans/source/blender/render/extern/include/RE_render_ext.h
branches/carve_booleans/source/blender/render/intern/include/pixelshading.h
branches/carve_booleans/source/blender/render/intern/include/render_types.h
branches/carve_booleans/source/blender/render/intern/include/rendercore.h
branches/carve_booleans/source/blender/render/intern/include/renderdatabase.h
branches/carve_booleans/source/blender/render/intern/include/shadbuf.h
branches/carve_booleans/source/blender/render/intern/include/shading.h
branches/carve_booleans/source/blender/render/intern/include/texture.h
branches/carve_booleans/source/blender/render/intern/include/volumetric.h
branches/carve_booleans/source/blender/render/intern/include/voxeldata.h
branches/carve_booleans/source/blender/render/intern/include/zbuf.h
branches/carve_booleans/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/carve_booleans/source/blender/render/intern/source/convertblender.c
branches/carve_booleans/source/blender/render/intern/source/envmap.c
branches/carve_booleans/source/blender/render/intern/source/imagetexture.c
branches/carve_booleans/source/blender/render/intern/source/occlusion.c
branches/carve_booleans/source/blender/render/intern/source/pipeline.c
branches/carve_booleans/source/blender/render/intern/source/pixelshading.c
branches/carve_booleans/source/blender/render/intern/source/pointdensity.c
branches/carve_booleans/source/blender/render/intern/source/render_texture.c
branches/carve_booleans/source/blender/render/intern/source/rendercore.c
branches/carve_booleans/source/blender/render/intern/source/renderdatabase.c
branches/carve_booleans/source/blender/render/intern/source/shadbuf.c
branches/carve_booleans/source/blender/render/intern/source/shadeinput.c
branches/carve_booleans/source/blender/render/intern/source/shadeoutput.c
branches/carve_booleans/source/blender/render/intern/source/sss.c
branches/carve_booleans/source/blender/render/intern/source/volume_precache.c
branches/carve_booleans/source/blender/render/intern/source/volumetric.c
branches/carve_booleans/source/blender/render/intern/source/voxeldata.c
branches/carve_booleans/source/blender/render/intern/source/zbuf.c
branches/carve_booleans/source/blender/windowmanager/SConscript
branches/carve_booleans/source/blender/windowmanager/WM_api.h
branches/carve_booleans/source/blender/windowmanager/intern/wm_dragdrop.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_event_system.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_files.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_gesture.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_init_exit.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_keymap.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_operators.c
branches/carve_booleans/source/blender/windowmanager/intern/wm_window.c
branches/carve_booleans/source/blenderplayer/CMakeLists.txt
branches/carve_booleans/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/carve_booleans/source/creator/CMakeLists.txt
branches/carve_booleans/source/creator/creator.c
branches/carve_booleans/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/carve_booleans/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/carve_booleans/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/carve_booleans/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/carve_booleans/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/carve_booleans/source/gameengine/Converter/CMakeLists.txt
branches/carve_booleans/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/carve_booleans/source/gameengine/Converter/SConscript
branches/carve_booleans/source/gameengine/Expressions/IfExpr.h
branches/carve_booleans/source/gameengine/GameLogic/SCA_IActuator.h
branches/carve_booleans/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/carve_booleans/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/carve_booleans/source/gameengine/GamePlayer/ghost/SConscript
branches/carve_booleans/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/carve_booleans/source/gameengine/Ketsji/BL_BlenderShader.h
branches/carve_booleans/source/gameengine/Ketsji/BL_Material.cpp
branches/carve_booleans/source/gameengine/Ketsji/BL_Material.h
branches/carve_booleans/source/gameengine/Ketsji/CMakeLists.txt
branches/carve_booleans/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/carve_booleans/source/gameengine/Ketsji/KX_Dome.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_GameObject.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_GameObject.h
branches/carve_booleans/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/carve_booleans/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/carve_booleans/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_PythonInit.h
branches/carve_booleans/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_Scene.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_Scene.h
branches/carve_booleans/source/gameengine/Ketsji/SConscript
branches/carve_booleans/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/carve_booleans/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/carve_booleans/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/carve_booleans/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/carve_booleans/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/carve_booleans/source/tests/bl_load_py_modules.py
Added Paths:
-----------
branches/carve_booleans/build_files/cmake/Modules/FindPCRE.cmake
branches/carve_booleans/build_files/cmake/Modules/FindXML2.cmake
branches/carve_booleans/build_files/cmake/cmake_static_check_cppcheck.py
branches/carve_booleans/build_files/cmake/cmake_static_check_sparse.py
branches/carve_booleans/build_files/cmake/cmake_static_check_splint.py
branches/carve_booleans/build_files/cmake/project_source_info.py
branches/carve_booleans/doc/python_api/rst/gpu.rst
branches/carve_booleans/doc/python_api/rst/info_best_practice.rst
branches/carve_booleans/extern/recastnavigation/
branches/carve_booleans/extern/recastnavigation/CMakeLists.txt
branches/carve_booleans/extern/recastnavigation/Detour/
branches/carve_booleans/extern/recastnavigation/Detour/Include/
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourCommon.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourNode.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
branches/carve_booleans/extern/recastnavigation/Detour/Source/
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourCommon.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourNode.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
branches/carve_booleans/extern/recastnavigation/License.txt
branches/carve_booleans/extern/recastnavigation/Readme.txt
branches/carve_booleans/extern/recastnavigation/Recast/
branches/carve_booleans/extern/recastnavigation/Recast/Include/
branches/carve_booleans/extern/recastnavigation/Recast/Include/Recast.h
branches/carve_booleans/extern/recastnavigation/Recast/Include/RecastLog.h
branches/carve_booleans/extern/recastnavigation/Recast/Include/RecastTimer.h
branches/carve_booleans/extern/recastnavigation/Recast/Source/
branches/carve_booleans/extern/recastnavigation/Recast/Source/Recast.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastContour.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastLog.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastMesh.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastRegion.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastTimer.cpp
branches/carve_booleans/extern/recastnavigation/SConscript
branches/carve_booleans/extern/recastnavigation/recast-capi.cpp
branches/carve_booleans/extern/recastnavigation/recast-capi.h
branches/carve_booleans/lib/
branches/carve_booleans/lib/tests/
branches/carve_booleans/lib/tests/paint/
branches/carve_booleans/lib/tests/paint/autoNormalizeTest.blend
branches/carve_booleans/lib/tests/paint/autoNormalizeTestResults.txt
branches/carve_booleans/lib/tests/paint/lockTestStage1.png
branches/carve_booleans/lib/tests/paint/lockTestStage2.png
branches/carve_booleans/lib/tests/paint/lockingTest.blend
branches/carve_booleans/lib/tests/paint/lockingTestResults.txt
branches/carve_booleans/lib/tests/paint/multi-paint test results.txt
branches/carve_booleans/lib/tests/paint/mutlipaintTest.blend
branches/carve_booleans/lib/tests/paint/smoothTest results.txt
branches/carve_booleans/lib/tests/paint/smoothTest.blend
branches/carve_booleans/lib/tests/paint/smoothTestResult.png
branches/carve_booleans/po/POTFILES.in
branches/carve_booleans/po/blender.pot
branches/carve_booleans/po/messages.txt
branches/carve_booleans/po/ne.po
branches/carve_booleans/po/update_mo.py
branches/carve_booleans/po/update_msg.py
branches/carve_booleans/po/update_po.py
branches/carve_booleans/po/update_pot.py
branches/carve_booleans/po/zh_TW.po
branches/carve_booleans/release/bin/.blender/fonts/
branches/carve_booleans/release/bin/.blender/fonts/droidsans.ttf.gz
branches/carve_booleans/release/bin/.blender/locale/ne/
branches/carve_booleans/release/bin/.blender/locale/ne/LC_MESSAGES/
branches/carve_booleans/release/bin/.blender/locale/zh_TW/
branches/carve_booleans/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
branches/carve_booleans/source/blender/blenfont/BLF_translation.h
branches/carve_booleans/source/blender/blenfont/intern/blf_translation.c
branches/carve_booleans/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/carve_booleans/source/blender/blenkernel/intern/navmesh_conversion.c
branches/carve_booleans/source/blender/blenlib/intern/string_utf8.c
branches/carve_booleans/source/blender/collada/ExportSettings.cpp
branches/carve_booleans/source/blender/collada/ExportSettings.h
branches/carve_booleans/source/blender/editors/object/object_navmesh.cpp
branches/carve_booleans/source/blender/modifiers/intern/MOD_navmesh.c
branches/carve_booleans/source/blender/python/intern/bpy_interface_atexit.c
branches/carve_booleans/source/blender/python/intern/gpu.c
branches/carve_booleans/source/blender/python/intern/gpu.h
branches/carve_booleans/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/carve_booleans/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_ObstacleSimulation.h
branches/carve_booleans/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/carve_booleans/source/gameengine/Ketsji/KX_SteeringActuator.h
Removed Paths:
-------------
branches/carve_booleans/extern/glew/ChangeLog
branches/carve_booleans/extern/glew/README.txt
branches/carve_booleans/extern/glew/doc/
branches/carve_booleans/extern/recastnavigation/CMakeLists.txt
branches/carve_booleans/extern/recastnavigation/Detour/
branches/carve_booleans/extern/recastnavigation/Detour/Include/
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourCommon.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourNode.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
branches/carve_booleans/extern/recastnavigation/Detour/Include/DetourTileNavMeshBuilder.h
branches/carve_booleans/extern/recastnavigation/Detour/Source/
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourCommon.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourNode.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourTileNavMesh.cpp
branches/carve_booleans/extern/recastnavigation/Detour/Source/DetourTileNavMeshBuilder.cpp
branches/carve_booleans/extern/recastnavigation/License.txt
branches/carve_booleans/extern/recastnavigation/Readme.txt
branches/carve_booleans/extern/recastnavigation/Recast/
branches/carve_booleans/extern/recastnavigation/Recast/Include/
branches/carve_booleans/extern/recastnavigation/Recast/Include/Recast.h
branches/carve_booleans/extern/recastnavigation/Recast/Include/RecastLog.h
branches/carve_booleans/extern/recastnavigation/Recast/Include/RecastTimer.h
branches/carve_booleans/extern/recastnavigation/Recast/Source/
branches/carve_booleans/extern/recastnavigation/Recast/Source/Recast.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastContour.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastFilter.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastLog.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastMesh.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastRegion.cpp
branches/carve_booleans/extern/recastnavigation/Recast/Source/RecastTimer.cpp
branches/carve_booleans/extern/recastnavigation/SConscript
branches/carve_booleans/lib/tests/
branches/carve_booleans/lib/tests/paint/
branches/carve_booleans/lib/tests/paint/autoNormalizeTest.blend
branches/carve_booleans/lib/tests/paint/autoNormalizeTestResults.txt
branches/carve_booleans/lib/tests/paint/lockTestStage1.png
branches/carve_booleans/lib/tests/paint/lockTestStage2.png
branches/carve_booleans/lib/tests/paint/lockingTest.blend
branches/carve_booleans/lib/tests/paint/lockingTestResults.txt
branches/carve_booleans/lib/tests/paint/multi-paint test results.txt
branches/carve_booleans/lib/tests/paint/mutlipaintTest.blend
branches/carve_booleans/lib/tests/paint/smoothTest results.txt
branches/carve_booleans/lib/tests/paint/smoothTest.blend
branches/carve_booleans/lib/tests/paint/smoothTestResult.png
branches/carve_booleans/release/bin/.blender/fonts/droidsans.ttf.gz
branches/carve_booleans/release/bin/.blender/locale/ne/LC_MESSAGES/
branches/carve_booleans/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
branches/carve_booleans/release/irix-6.2-mips/
branches/carve_booleans/release/scripts/startup/bl_operators/nla.py
branches/carve_booleans/source/blender/blenkernel/BKE_endian.h
Property Changed:
----------------
branches/carve_booleans/
branches/carve_booleans/source/blender/editors/space_outliner/
Property changes on: branches/carve_booleans
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:37404-40000
+ /trunk/blender:40001-40500
Modified: branches/carve_booleans/CMakeLists.txt
===================================================================
--- branches/carve_booleans/CMakeLists.txt 2011-10-07 05:19:21 UTC (rev 40842)
+++ branches/carve_booleans/CMakeLists.txt 2011-10-07 06:21:55 UTC (rev 40843)
@@ -105,6 +105,7 @@
get_blender_version()
+
# Blender internal features
option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
mark_as_advanced(WITH_BLENDER)
@@ -455,15 +456,8 @@
if(WITH_OPENCOLLADA)
find_package(OpenCOLLADA)
if(OPENCOLLADA_FOUND)
- set(PCRE /usr CACHE PATH "PCRE Directory")
- mark_as_advanced(PCRE)
- set(PCRE_LIBPATH ${PCRE}/lib)
- set(PCRE_LIB pcre)
-
- set(EXPAT /usr CACHE PATH "Expat Directory")
- mark_as_advanced(EXPAT)
- set(EXPAT_LIBPATH ${EXPAT}/lib)
- set(EXPAT_LIB expat)
+ find_package(XML2)
+ find_package(PCRE)
else()
set(WITH_OPENCOLLADA OFF)
endif()
@@ -652,11 +646,7 @@
set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INC ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- if(CMAKE_CL_64)
- set(GETTEXT_LIB gettext)
- else()
- set(GETTEXT_LIB gnu_gettext)
- endif()
+ set(GETTEXT_LIB gnu_gettext)
endif()
if(CMAKE_CL_64)
@@ -712,7 +702,7 @@
${LIBDIR}/opencollada/lib/ftoa.lib
${LIBDIR}/opencollada/lib/UTF.lib
)
- set(PCRE_LIB
+ set(PCRE_LIBRARIES
${LIBDIR}/opencollada/lib/pcre.lib
)
endif()
@@ -854,7 +844,7 @@
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
- set(PCRE_LIB pcre)
+ set(PCRE_LIBRARIES pcre)
endif()
if(WITH_CODEC_FFMPEG)
@@ -1076,7 +1066,7 @@
#pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)
- set(PCRE_LIB pcre)
+ set(PCRE_LIBRARIES pcre)
#libxml2 is used
#set(EXPAT ${LIBDIR}/expat)
#set(EXPAT_LIBPATH ${EXPAT}/lib)
@@ -1164,6 +1154,18 @@
unset(_sse2)
endif()
+
+# set the endian define
+include(TestBigEndian)
+test_big_endian(_SYSTEM_BIG_ENDIAN)
+if(_SYSTEM_BIG_ENDIAN)
+ add_definitions(-D__BIG_ENDIAN__)
+else()
+ add_definitions(-D__LITTLE_ENDIAN__)
+endif()
+unset(_SYSTEM_BIG_ENDIAN)
+
+
if(WITH_IMAGE_OPENJPEG)
if(UNIX AND NOT APPLE)
# dealt with above
Modified: branches/carve_booleans/GNUmakefile
===================================================================
--- branches/carve_booleans/GNUmakefile 2011-10-07 05:19:21 UTC (rev 40842)
+++ branches/carve_booleans/GNUmakefile 2011-10-07 06:21:55 UTC (rev 40843)
@@ -36,7 +36,7 @@
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=""
+BUILD_CMAKE_ARGS:=
# -----------------------------------------------------------------------------
@@ -77,14 +77,24 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
+
# -----------------------------------------------------------------------------
+# Macro for configuring cmake
+
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
+ -H$(BLENDER_DIR) \
+ -B$(BUILD_DIR) \
+ -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
+
+
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+ $(CMAKE_CONFIG); \
fi
@echo
@@ -120,12 +130,21 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
+ @echo "Other Targets"
+ @echo " * translations - update blenders translation files in po/"
+ # TODO, doxygen and sphinx docs
+ @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
@echo ""
+ @echo "Static Source Code Checking (not assosiated with building blender)"
+ @echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
+ @echo " * check_splint - run blenders source through splint (C only)"
+ @echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo ""
# -----------------------------------------------------------------------------
# Packages
@@ -142,6 +161,16 @@
# -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+ $(BUILD_DIR)/bin/blender --background --python po/update_msg.py
+ python3 po/update_pot.py
+ python3 po/update_po.py
+ python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
# Tests
#
test:
@@ -176,6 +205,23 @@
cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+# -----------------------------------------------------------------------------
+# Static Checking
+#
+
+check_cppcheck:
+ $(CMAKE_CONFIG)
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+
+check_splint:
+ $(CMAKE_CONFIG)
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+
+check_sparse:
+ $(CMAKE_CONFIG)
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/carve_booleans/SConstruct
===================================================================
--- branches/carve_booleans/SConstruct 2011-10-07 05:19:21 UTC (rev 40842)
+++ branches/carve_booleans/SConstruct 2011-10-07 06:21:55 UTC (rev 40843)
@@ -337,6 +337,17 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+
+if btools.ENDIAN == "big":
+ env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
+ env['CXXFLAGS'].append('-D__BIG_ENDIAN__')
+ env['CCFLAGS'].append('-D__BIG_ENDIAN__')
+else:
+ env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
+ env['CXXFLAGS'].append('-D__LITTLE_ENDIAN__')
+ env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')
+
+
# TODO, make optional
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CXXFLAGS'].append('-DWITH_AUDASPACE')
@@ -501,31 +512,35 @@
dottargetlist = []
scriptinstall = []
-if env['OURPLATFORM']!='darwin':
- for dp, dn, df in os.walk('bin/.blender'):
+if env['OURPLATFORM']!='darwin':
+ for dp, dn, df in os.walk('release/bin/.blender'):
+ dp = os.path.normpath(dp)
+
if '.svn' in dn:
dn.remove('.svn')
if '_svn' in dn:
dn.remove('_svn')
for f in df:
+ # This files aren't used anymore
+ if f in ['.Blanguages', '.bfont.ttf']:
+ continue
+
if not env['WITH_BF_INTERNATIONAL']:
if 'locale' in dp:
continue
- if f == '.Blanguages':
- continue
if not env['WITH_BF_FREETYPE']:
if f.endswith('.ttf'):
continue
- if 'locale' in dp:
+ if 'locale' in dp or 'fonts' in dp:
datafileslist.append(os.path.join(dp,f))
- dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:])) # skip bin
+ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:])) # skip bin
datafilestargetlist.append(dir + os.sep + f)
else:
dotblendlist.append(os.path.join(dp, f))
- dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[1:])) # skip bin
+ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:])) # skip bin
dottargetlist.append(dir + os.sep + f)
dotblenderinstall = []
@@ -645,7 +660,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+ if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
Modified: branches/carve_booleans/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/carve_booleans/build_files/buildbot/config/user-config-i686.py 2011-10-07 05:19:21 UTC (rev 40842)
+++ branches/carve_booleans/build_files/buildbot/config/user-config-i686.py 2011-10-07 06:21:55 UTC (rev 40843)
@@ -5,7 +5,7 @@
# Python configuration
BF_PYTHON_VERSION = '3.2'
BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
@@ -87,6 +87,10 @@
BF_3DMOUSE = '/home/sources/staticlibs/spnav'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/carve_booleans/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/carve_booleans/build_files/buildbot/config/user-config-player-i686.py 2011-10-07 05:19:21 UTC (rev 40842)
+++ branches/carve_booleans/build_files/buildbot/config/user-config-player-i686.py 2011-10-07 06:21:55 UTC (rev 40843)
@@ -5,7 +5,7 @@
# Python configuration
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list