Revision: 43443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43443
Author: kupoman
Date: 2012-01-17 05:22:27 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Merge from Trunk r42866:43440
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42866
Modified Paths:
--------------
branches/ge_harmony/CMakeLists.txt
branches/ge_harmony/SConstruct
branches/ge_harmony/build_files/cmake/RpmBuild.cmake
branches/ge_harmony/build_files/cmake/macros.cmake
branches/ge_harmony/build_files/scons/config/freebsd7-config.py
branches/ge_harmony/build_files/scons/config/freebsd8-config.py
branches/ge_harmony/build_files/scons/config/freebsd9-config.py
branches/ge_harmony/build_files/scons/config/linux-config.py
branches/ge_harmony/build_files/scons/config/linuxcross-config.py
branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
branches/ge_harmony/build_files/scons/config/win32-vc-config.py
branches/ge_harmony/build_files/scons/config/win64-vc-config.py
branches/ge_harmony/build_files/scons/tools/btools.py
branches/ge_harmony/doc/python_api/examples/bpy.types.Menu.1.py
branches/ge_harmony/doc/python_api/examples/bpy.types.Menu.py
branches/ge_harmony/doc/python_api/examples/bpy.types.Operator.4.py
branches/ge_harmony/doc/python_api/examples/bpy.types.Operator.5.py
branches/ge_harmony/doc/python_api/examples/bpy.types.Panel.1.py
branches/ge_harmony/doc/python_api/rst/bge.texture.rst
branches/ge_harmony/doc/python_api/rst/bge.types.rst
branches/ge_harmony/doc/python_api/rst/info_best_practice.rst
branches/ge_harmony/doc/python_api/rst/info_overview.rst
branches/ge_harmony/doc/python_api/rst/info_quickstart.rst
branches/ge_harmony/doc/python_api/rst/info_tips_and_tricks.rst
branches/ge_harmony/extern/CMakeLists.txt
branches/ge_harmony/extern/SConscript
branches/ge_harmony/extern/libmv/CMakeLists.txt
branches/ge_harmony/extern/libmv/SConscript
branches/ge_harmony/extern/libmv/bundle.sh
branches/ge_harmony/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/ge_harmony/extern/libmv/third_party/glog/src/utilities.cc
branches/ge_harmony/intern/CMakeLists.txt
branches/ge_harmony/intern/SConscript
branches/ge_harmony/intern/boolop/CMakeLists.txt
branches/ge_harmony/intern/boolop/SConscript
branches/ge_harmony/intern/boolop/intern/BOP_BSPNode.cpp
branches/ge_harmony/intern/boolop/intern/BOP_BSPNode.h
branches/ge_harmony/intern/boolop/intern/BOP_BSPTree.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Edge.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Face.h
branches/ge_harmony/intern/boolop/intern/BOP_Indexs.h
branches/ge_harmony/intern/boolop/intern/BOP_Interface.cpp
branches/ge_harmony/intern/boolop/intern/BOP_MathUtils.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Merge.h
branches/ge_harmony/intern/boolop/intern/BOP_Merge2.h
branches/ge_harmony/intern/boolop/intern/BOP_Mesh.h
branches/ge_harmony/intern/boolop/intern/BOP_Segment.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Segment.h
branches/ge_harmony/intern/boolop/intern/BOP_Splitter.cpp
branches/ge_harmony/intern/boolop/intern/BOP_Triangulator.cpp
branches/ge_harmony/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/ge_harmony/intern/cycles/CMakeLists.txt
branches/ge_harmony/intern/cycles/app/cycles_server.cpp
branches/ge_harmony/intern/cycles/app/cycles_test.cpp
branches/ge_harmony/intern/cycles/app/cycles_xml.cpp
branches/ge_harmony/intern/cycles/blender/CMakeLists.txt
branches/ge_harmony/intern/cycles/blender/addon/__init__.py
branches/ge_harmony/intern/cycles/blender/addon/engine.py
branches/ge_harmony/intern/cycles/blender/addon/enums.py
branches/ge_harmony/intern/cycles/blender/addon/properties.py
branches/ge_harmony/intern/cycles/blender/addon/ui.py
branches/ge_harmony/intern/cycles/blender/blender_camera.cpp
branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
branches/ge_harmony/intern/cycles/blender/blender_object.cpp
branches/ge_harmony/intern/cycles/blender/blender_python.cpp
branches/ge_harmony/intern/cycles/blender/blender_session.cpp
branches/ge_harmony/intern/cycles/blender/blender_session.h
branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.h
branches/ge_harmony/intern/cycles/bvh/bvh.cpp
branches/ge_harmony/intern/cycles/bvh/bvh.h
branches/ge_harmony/intern/cycles/bvh/bvh_params.h
branches/ge_harmony/intern/cycles/device/device.cpp
branches/ge_harmony/intern/cycles/device/device.h
branches/ge_harmony/intern/cycles/device/device_cpu.cpp
branches/ge_harmony/intern/cycles/device/device_cuda.cpp
branches/ge_harmony/intern/cycles/device/device_intern.h
branches/ge_harmony/intern/cycles/device/device_memory.h
branches/ge_harmony/intern/cycles/device/device_multi.cpp
branches/ge_harmony/intern/cycles/device/device_network.cpp
branches/ge_harmony/intern/cycles/device/device_opencl.cpp
branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/kernel.cl
branches/ge_harmony/intern/cycles/kernel/kernel.cpp
branches/ge_harmony/intern/cycles/kernel/kernel.cu
branches/ge_harmony/intern/cycles/kernel/kernel.h
branches/ge_harmony/intern/cycles/kernel/kernel_displace.h
branches/ge_harmony/intern/cycles/kernel/kernel_optimized.cpp
branches/ge_harmony/intern/cycles/kernel/kernel_types.h
branches/ge_harmony/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/ge_harmony/intern/cycles/kernel/svm/svm.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_hsv.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_musgrave.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_normal.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_types.h
branches/ge_harmony/intern/cycles/render/buffers.cpp
branches/ge_harmony/intern/cycles/render/mesh.cpp
branches/ge_harmony/intern/cycles/render/mesh_displace.cpp
branches/ge_harmony/intern/cycles/render/nodes.cpp
branches/ge_harmony/intern/cycles/render/nodes.h
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/render/session.h
branches/ge_harmony/intern/cycles/render/tile.cpp
branches/ge_harmony/intern/cycles/util/util_cache.cpp
branches/ge_harmony/intern/cycles/util/util_cache.h
branches/ge_harmony/intern/cycles/util/util_progress.h
branches/ge_harmony/intern/ghost/CMakeLists.txt
branches/ge_harmony/intern/ghost/GHOST_ISystem.h
branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_System.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_System.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/ge_harmony/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.cpp
branches/ge_harmony/intern/guardedalloc/MEM_sys_types.h
branches/ge_harmony/intern/smoke/intern/smoke_API.cpp
branches/ge_harmony/intern/tools/dump_rna2xml.py
branches/ge_harmony/release/datafiles/blender_icons.png
branches/ge_harmony/release/plugins/sequence/color-correction-hsv.c
branches/ge_harmony/release/plugins/sequence/color-correction-yuv.c
branches/ge_harmony/release/plugins/sequence/dnr.c
branches/ge_harmony/release/plugins/sequence/gamma.c
branches/ge_harmony/release/scripts/modules/addon_utils.py
branches/ge_harmony/release/scripts/modules/animsys_refactor.py
branches/ge_harmony/release/scripts/modules/bpy/utils.py
branches/ge_harmony/release/scripts/modules/rna_prop_ui.py
branches/ge_harmony/release/scripts/modules/sys_info.py
branches/ge_harmony/release/scripts/presets/ffmpeg/DV.py
branches/ge_harmony/release/scripts/presets/ffmpeg/DVD.py
branches/ge_harmony/release/scripts/presets/ffmpeg/SVCD.py
branches/ge_harmony/release/scripts/presets/ffmpeg/VCD.py
branches/ge_harmony/release/scripts/presets/ffmpeg/h264.py
branches/ge_harmony/release/scripts/presets/ffmpeg/theora.py
branches/ge_harmony/release/scripts/presets/ffmpeg/xvid.py
branches/ge_harmony/release/scripts/presets/keyconfig/maya.py
branches/ge_harmony/release/scripts/startup/bl_operators/anim.py
branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
branches/ge_harmony/release/scripts/startup/bl_operators/mesh.py
branches/ge_harmony/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/ge_harmony/release/scripts/startup/bl_operators/presets.py
branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_curve.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_object.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_particle.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_clip.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_dopesheet.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_graph.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_image.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_info.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_logic.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_nla.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_sequencer.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_time.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/ge_harmony/release/scripts/templates/addon_add_object.py
branches/ge_harmony/source/blender/blenfont/BLF_api.h
branches/ge_harmony/source/blender/blenfont/intern/blf.c
branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
branches/ge_harmony/source/blender/blenkernel/BKE_armature.h
branches/ge_harmony/source/blender/blenkernel/BKE_array_mallocn.h
branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
branches/ge_harmony/source/blender/blenkernel/BKE_brush.h
branches/ge_harmony/source/blender/blenkernel/BKE_cloth.h
branches/ge_harmony/source/blender/blenkernel/BKE_colortools.h
branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
branches/ge_harmony/source/blender/blenkernel/BKE_deform.h
branches/ge_harmony/source/blender/blenkernel/BKE_global.h
branches/ge_harmony/source/blender/blenkernel/BKE_main.h
branches/ge_harmony/source/blender/blenkernel/BKE_mesh.h
branches/ge_harmony/source/blender/blenkernel/BKE_movieclip.h
branches/ge_harmony/source/blender/blenkernel/BKE_node.h
branches/ge_harmony/source/blender/blenkernel/BKE_particle.h
branches/ge_harmony/source/blender/blenkernel/BKE_sequencer.h
branches/ge_harmony/source/blender/blenkernel/BKE_sound.h
branches/ge_harmony/source/blender/blenkernel/BKE_text.h
branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
branches/ge_harmony/source/blender/blenkernel/BKE_writeavi.h
branches/ge_harmony/source/blender/blenkernel/BKE_writeffmpeg.h
branches/ge_harmony/source/blender/blenkernel/BKE_writeframeserver.h
branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_harmony/source/blender/blenkernel/intern/boids.c
branches/ge_harmony/source/blender/blenkernel/intern/brush.c
branches/ge_harmony/source/blender/blenkernel/intern/bvhutils.c
branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/cloth.c
branches/ge_harmony/source/blender/blenkernel/intern/colortools.c
branches/ge_harmony/source/blender/blenkernel/intern/constraint.c
branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
branches/ge_harmony/source/blender/blenkernel/intern/deform.c
branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
branches/ge_harmony/source/blender/blenkernel/intern/displist.c
branches/ge_harmony/source/blender/blenkernel/intern/dynamicpaint.c
branches/ge_harmony/source/blender/blenkernel/intern/image.c
branches/ge_harmony/source/blender/blenkernel/intern/ipo.c
branches/ge_harmony/source/blender/blenkernel/intern/library.c
branches/ge_harmony/source/blender/blenkernel/intern/material.c
branches/ge_harmony/source/blender/blenkernel/intern/mball.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
branches/ge_harmony/source/blender/blenkernel/intern/movieclip.c
branches/ge_harmony/source/blender/blenkernel/intern/multires.c
branches/ge_harmony/source/blender/blenkernel/intern/node.c
branches/ge_harmony/source/blender/blenkernel/intern/object.c
branches/ge_harmony/source/blender/blenkernel/intern/packedFile.c
branches/ge_harmony/source/blender/blenkernel/intern/particle.c
branches/ge_harmony/source/blender/blenkernel/intern/particle_system.c
branches/ge_harmony/source/blender/blenkernel/intern/pointcache.c
branches/ge_harmony/source/blender/blenkernel/intern/property.c
branches/ge_harmony/source/blender/blenkernel/intern/sca.c
branches/ge_harmony/source/blender/blenkernel/intern/scene.c
branches/ge_harmony/source/blender/blenkernel/intern/seqeffects.c
branches/ge_harmony/source/blender/blenkernel/intern/sequencer.c
branches/ge_harmony/source/blender/blenkernel/intern/softbody.c
branches/ge_harmony/source/blender/blenkernel/intern/sound.c
branches/ge_harmony/source/blender/blenkernel/intern/text.c
branches/ge_harmony/source/blender/blenkernel/intern/texture.c
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/blenkernel/intern/writeavi.c
branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_harmony/source/blender/blenkernel/intern/writeframeserver.c
branches/ge_harmony/source/blender/blenlib/BLI_edgehash.h
branches/ge_harmony/source/blender/blenlib/BLI_editVert.h
branches/ge_harmony/source/blender/blenlib/BLI_fnmatch.h
branches/ge_harmony/source/blender/blenlib/BLI_math_color.h
branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
branches/ge_harmony/source/blender/blenlib/intern/BLI_mempool.c
branches/ge_harmony/source/blender/blenlib/intern/boxpack2d.c
branches/ge_harmony/source/blender/blenlib/intern/edgehash.c
branches/ge_harmony/source/blender/blenlib/intern/fileops.c
branches/ge_harmony/source/blender/blenlib/intern/math_color.c
branches/ge_harmony/source/blender/blenlib/intern/math_matrix.c
branches/ge_harmony/source/blender/blenlib/intern/path_util.c
branches/ge_harmony/source/blender/blenlib/intern/storage.c
branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/blenloader/intern/writefile.c
branches/ge_harmony/source/blender/collada/MeshImporter.cpp
branches/ge_harmony/source/blender/editors/animation/anim_channels_edit.c
branches/ge_harmony/source/blender/editors/animation/anim_draw.c
branches/ge_harmony/source/blender/editors/animation/anim_filter.c
branches/ge_harmony/source/blender/editors/animation/anim_ipo_utils.c
branches/ge_harmony/source/blender/editors/animation/anim_markers.c
branches/ge_harmony/source/blender/editors/animation/anim_ops.c
branches/ge_harmony/source/blender/editors/animation/keyframing.c
branches/ge_harmony/source/blender/editors/armature/armature_intern.h
branches/ge_harmony/source/blender/editors/armature/armature_ops.c
branches/ge_harmony/source/blender/editors/armature/editarmature.c
branches/ge_harmony/source/blender/editors/armature/editarmature_retarget.c
branches/ge_harmony/source/blender/editors/armature/meshlaplacian.c
branches/ge_harmony/source/blender/editors/armature/poseSlide.c
branches/ge_harmony/source/blender/editors/armature/poselib.c
branches/ge_harmony/source/blender/editors/armature/poseobject.c
branches/ge_harmony/source/blender/editors/armature/reeb.c
branches/ge_harmony/source/blender/editors/curve/curve_intern.h
branches/ge_harmony/source/blender/editors/curve/curve_ops.c
branches/ge_harmony/source/blender/editors/curve/editcurve.c
branches/ge_harmony/source/blender/editors/curve/editfont.c
branches/ge_harmony/source/blender/editors/datafiles/Bfont.c
branches/ge_harmony/source/blender/editors/datafiles/blender_icons.png.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_buttons.c
branches/ge_harmony/source/blender/editors/gpencil/gpencil_ops.c
branches/ge_harmony/source/blender/editors/include/BIF_glutil.h
branches/ge_harmony/source/blender/editors/include/ED_armature.h
branches/ge_harmony/source/blender/editors/include/ED_image.h
branches/ge_harmony/source/blender/editors/include/ED_object.h
branches/ge_harmony/source/blender/editors/include/ED_view3d.h
branches/ge_harmony/source/blender/editors/include/UI_icons.h
branches/ge_harmony/source/blender/editors/interface/interface.c
branches/ge_harmony/source/blender/editors/interface/interface_draw.c
branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
branches/ge_harmony/source/blender/editors/interface/interface_intern.h
branches/ge_harmony/source/blender/editors/interface/interface_layout.c
branches/ge_harmony/source/blender/editors/interface/interface_ops.c
branches/ge_harmony/source/blender/editors/interface/interface_regions.c
branches/ge_harmony/source/blender/editors/interface/interface_style.c
branches/ge_harmony/source/blender/editors/interface/interface_templates.c
branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
branches/ge_harmony/source/blender/editors/interface/view2d.c
branches/ge_harmony/source/blender/editors/interface/view2d_ops.c
branches/ge_harmony/source/blender/editors/mesh/editmesh.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_lib.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_mods.c
branches/ge_harmony/source/blender/editors/mesh/editmesh_tools.c
branches/ge_harmony/source/blender/editors/mesh/mesh_data.c
branches/ge_harmony/source/blender/editors/mesh/mesh_intern.h
branches/ge_harmony/source/blender/editors/mesh/mesh_ops.c
branches/ge_harmony/source/blender/editors/mesh/meshtools.c
branches/ge_harmony/source/blender/editors/metaball/mball_edit.c
branches/ge_harmony/source/blender/editors/metaball/mball_intern.h
branches/ge_harmony/source/blender/editors/metaball/mball_ops.c
branches/ge_harmony/source/blender/editors/object/object_add.c
branches/ge_harmony/source/blender/editors/object/object_bake.c
branches/ge_harmony/source/blender/editors/object/object_constraint.c
branches/ge_harmony/source/blender/editors/object/object_edit.c
branches/ge_harmony/source/blender/editors/object/object_group.c
branches/ge_harmony/source/blender/editors/object/object_hook.c
branches/ge_harmony/source/blender/editors/object/object_intern.h
branches/ge_harmony/source/blender/editors/object/object_modifier.c
branches/ge_harmony/source/blender/editors/object/object_ops.c
branches/ge_harmony/source/blender/editors/object/object_relations.c
branches/ge_harmony/source/blender/editors/object/object_select.c
branches/ge_harmony/source/blender/editors/object/object_shapekey.c
branches/ge_harmony/source/blender/editors/object/object_transform.c
branches/ge_harmony/source/blender/editors/object/object_vgroup.c
branches/ge_harmony/source/blender/editors/physics/dynamicpaint_ops.c
branches/ge_harmony/source/blender/editors/physics/particle_edit.c
branches/ge_harmony/source/blender/editors/physics/particle_object.c
branches/ge_harmony/source/blender/editors/physics/physics_fluid.c
branches/ge_harmony/source/blender/editors/physics/physics_intern.h
branches/ge_harmony/source/blender/editors/physics/physics_ops.c
branches/ge_harmony/source/blender/editors/render/render_internal.c
branches/ge_harmony/source/blender/editors/render/render_opengl.c
branches/ge_harmony/source/blender/editors/render/render_preview.c
branches/ge_harmony/source/blender/editors/render/render_shading.c
branches/ge_harmony/source/blender/editors/screen/area.c
branches/ge_harmony/source/blender/editors/screen/glutil.c
branches/ge_harmony/source/blender/editors/screen/screen_edit.c
branches/ge_harmony/source/blender/editors/screen/screen_ops.c
branches/ge_harmony/source/blender/editors/screen/screendump.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_intern.h
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_ops.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_utils.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_harmony/source/blender/editors/sound/sound_ops.c
branches/ge_harmony/source/blender/editors/space_action/action_draw.c
branches/ge_harmony/source/blender/editors/space_action/action_ops.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_header.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_ops.c
branches/ge_harmony/source/blender/editors/space_buttons/buttons_texture.c
branches/ge_harmony/source/blender/editors/space_buttons/space_buttons.c
branches/ge_harmony/source/blender/editors/space_clip/clip_draw.c
branches/ge_harmony/source/blender/editors/space_clip/clip_editor.c
branches/ge_harmony/source/blender/editors/space_clip/clip_graph_draw.c
branches/ge_harmony/source/blender/editors/space_clip/clip_graph_ops.c
branches/ge_harmony/source/blender/editors/space_clip/clip_intern.h
branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
branches/ge_harmony/source/blender/editors/space_clip/clip_utils.c
branches/ge_harmony/source/blender/editors/space_clip/space_clip.c
branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
branches/ge_harmony/source/blender/editors/space_console/console_ops.c
branches/ge_harmony/source/blender/editors/space_console/space_console.c
branches/ge_harmony/source/blender/editors/space_file/file_draw.c
branches/ge_harmony/source/blender/editors/space_file/filelist.c
branches/ge_harmony/source/blender/editors/space_file/filesel.c
branches/ge_harmony/source/blender/editors/space_file/space_file.c
branches/ge_harmony/source/blender/editors/space_graph/graph_buttons.c
branches/ge_harmony/source/blender/editors/space_graph/graph_draw.c
branches/ge_harmony/source/blender/editors/space_graph/graph_edit.c
branches/ge_harmony/source/blender/editors/space_graph/graph_ops.c
branches/ge_harmony/source/blender/editors/space_graph/graph_select.c
branches/ge_harmony/source/blender/editors/space_image/image_buttons.c
branches/ge_harmony/source/blender/editors/space_image/image_draw.c
branches/ge_harmony/source/blender/editors/space_image/image_intern.h
branches/ge_harmony/source/blender/editors/space_image/image_ops.c
branches/ge_harmony/source/blender/editors/space_image/space_image.c
branches/ge_harmony/source/blender/editors/space_info/info_ops.c
branches/ge_harmony/source/blender/editors/space_logic/logic_ops.c
branches/ge_harmony/source/blender/editors/space_logic/logic_window.c
branches/ge_harmony/source/blender/editors/space_nla/nla_draw.c
branches/ge_harmony/source/blender/editors/space_nla/nla_ops.c
branches/ge_harmony/source/blender/editors/space_node/drawnode.c
branches/ge_harmony/source/blender/editors/space_node/node_draw.c
branches/ge_harmony/source/blender/editors/space_node/node_edit.c
branches/ge_harmony/source/blender/editors/space_node/node_intern.h
branches/ge_harmony/source/blender/editors/space_node/node_ops.c
branches/ge_harmony/source/blender/editors/space_node/node_templates.c
branches/ge_harmony/source/blender/editors/space_node/space_node.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_draw.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_edit.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_ops.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_tree.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_add.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_draw.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_edit.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_intern.h
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_ops.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/ge_harmony/source/blender/editors/space_sequencer/sequencer_select.c
branches/ge_harmony/source/blender/editors/space_text/space_text.c
branches/ge_harmony/source/blender/editors/space_text/text_draw.c
branches/ge_harmony/source/blender/editors/space_text/text_intern.h
branches/ge_harmony/source/blender/editors/space_text/text_ops.c
branches/ge_harmony/source/blender/editors/space_view3d/drawanimviz.c
branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
branches/ge_harmony/source/blender/editors/space_view3d/space_view3d.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_buttons.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_intern.h
branches/ge_harmony/source/blender/editors/space_view3d/view3d_ops.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_select.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
branches/ge_harmony/source/blender/editors/transform/transform.c
branches/ge_harmony/source/blender/editors/transform/transform.h
branches/ge_harmony/source/blender/editors/transform/transform_constraints.c
branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
branches/ge_harmony/source/blender/editors/transform/transform_generics.c
branches/ge_harmony/source/blender/editors/transform/transform_ops.c
branches/ge_harmony/source/blender/editors/transform/transform_orientations.c
branches/ge_harmony/source/blender/editors/transform/transform_snap.c
branches/ge_harmony/source/blender/editors/util/ed_util.c
branches/ge_harmony/source/blender/editors/util/numinput.c
branches/ge_harmony/source/blender/editors/util/undo.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_harmony/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_harmony/source/blender/gpu/GPU_buffers.h
branches/ge_harmony/source/blender/gpu/GPU_extensions.h
branches/ge_harmony/source/blender/gpu/intern/gpu_buffers.c
branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl
branches/ge_harmony/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/ge_harmony/source/blender/imbuf/IMB_imbuf.h
branches/ge_harmony/source/blender/imbuf/IMB_imbuf_types.h
branches/ge_harmony/source/blender/imbuf/intern/anim_movie.c
branches/ge_harmony/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/ge_harmony/source/blender/imbuf/intern/divers.c
branches/ge_harmony/source/blender/imbuf/intern/indexer.c
branches/ge_harmony/source/blender/imbuf/intern/tiff.c
branches/ge_harmony/source/blender/makesdna/DNA_ID.h
branches/ge_harmony/source/blender/makesdna/DNA_action_types.h
branches/ge_harmony/source/blender/makesdna/DNA_actuator_types.h
branches/ge_harmony/source/blender/makesdna/DNA_anim_types.h
branches/ge_harmony/source/blender/makesdna/DNA_armature_types.h
branches/ge_harmony/source/blender/makesdna/DNA_boid_types.h
branches/ge_harmony/source/blender/makesdna/DNA_brush_types.h
branches/ge_harmony/source/blender/makesdna/DNA_camera_types.h
branches/ge_harmony/source/blender/makesdna/DNA_cloth_types.h
branches/ge_harmony/source/blender/makesdna/DNA_color_types.h
branches/ge_harmony/source/blender/makesdna/DNA_constraint_types.h
branches/ge_harmony/source/blender/makesdna/DNA_controller_types.h
branches/ge_harmony/source/blender/makesdna/DNA_curve_types.h
branches/ge_harmony/source/blender/makesdna/DNA_customdata_types.h
branches/ge_harmony/source/blender/makesdna/DNA_defs.h
branches/ge_harmony/source/blender/makesdna/DNA_documentation.h
branches/ge_harmony/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/ge_harmony/source/blender/makesdna/DNA_effect_types.h
branches/ge_harmony/source/blender/makesdna/DNA_fileglobal_types.h
branches/ge_harmony/source/blender/makesdna/DNA_genfile.h
branches/ge_harmony/source/blender/makesdna/DNA_gpencil_types.h
branches/ge_harmony/source/blender/makesdna/DNA_group_types.h
branches/ge_harmony/source/blender/makesdna/DNA_image_types.h
branches/ge_harmony/source/blender/makesdna/DNA_key_types.h
branches/ge_harmony/source/blender/makesdna/DNA_lamp_types.h
branches/ge_harmony/source/blender/makesdna/DNA_lattice_types.h
branches/ge_harmony/source/blender/makesdna/DNA_listBase.h
branches/ge_harmony/source/blender/makesdna/DNA_material_types.h
branches/ge_harmony/source/blender/makesdna/DNA_mesh_types.h
branches/ge_harmony/source/blender/makesdna/DNA_meshdata_types.h
branches/ge_harmony/source/blender/makesdna/DNA_meta_types.h
branches/ge_harmony/source/blender/makesdna/DNA_modifier_types.h
branches/ge_harmony/source/blender/makesdna/DNA_movieclip_types.h
branches/ge_harmony/source/blender/makesdna/DNA_nla_types.h
branches/ge_harmony/source/blender/makesdna/DNA_node_types.h
branches/ge_harmony/source/blender/makesdna/DNA_object_fluidsim.h
branches/ge_harmony/source/blender/makesdna/DNA_object_force.h
branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
branches/ge_harmony/source/blender/makesdna/DNA_outliner_types.h
branches/ge_harmony/source/blender/makesdna/DNA_packedFile_types.h
branches/ge_harmony/source/blender/makesdna/DNA_particle_types.h
branches/ge_harmony/source/blender/makesdna/DNA_property_types.h
branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
branches/ge_harmony/source/blender/makesdna/DNA_screen_types.h
branches/ge_harmony/source/blender/makesdna/DNA_sdna_types.h
branches/ge_harmony/source/blender/makesdna/DNA_sensor_types.h
branches/ge_harmony/source/blender/makesdna/DNA_sequence_types.h
branches/ge_harmony/source/blender/makesdna/DNA_smoke_types.h
branches/ge_harmony/source/blender/makesdna/DNA_sound_types.h
branches/ge_harmony/source/blender/makesdna/DNA_space_types.h
branches/ge_harmony/source/blender/makesdna/DNA_speaker_types.h
branches/ge_harmony/source/blender/makesdna/DNA_text_types.h
branches/ge_harmony/source/blender/makesdna/DNA_texture_types.h
branches/ge_harmony/source/blender/makesdna/DNA_tracking_types.h
branches/ge_harmony/source/blender/makesdna/DNA_userdef_types.h
branches/ge_harmony/source/blender/makesdna/DNA_vec_types.h
branches/ge_harmony/source/blender/makesdna/DNA_vfont_types.h
branches/ge_harmony/source/blender/makesdna/DNA_view2d_types.h
branches/ge_harmony/source/blender/makesdna/DNA_view3d_types.h
branches/ge_harmony/source/blender/makesdna/DNA_windowmanager_types.h
branches/ge_harmony/source/blender/makesdna/DNA_world_types.h
branches/ge_harmony/source/blender/makesrna/RNA_access.h
branches/ge_harmony/source/blender/makesrna/RNA_enum_types.h
branches/ge_harmony/source/blender/makesrna/SConscript
branches/ge_harmony/source/blender/makesrna/intern/CMakeLists.txt
branches/ge_harmony/source/blender/makesrna/intern/SConscript
branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
branches/ge_harmony/source/blender/makesrna/intern/rna_actuator.c
branches/ge_harmony/source/blender/makesrna/intern/rna_brush.c
branches/ge_harmony/source/blender/makesrna/intern/rna_constraint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
branches/ge_harmony/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_fluidsim.c
branches/ge_harmony/source/blender/makesrna/intern/rna_image.c
branches/ge_harmony/source/blender/makesrna/intern/rna_main.c
branches/ge_harmony/source/blender/makesrna/intern/rna_modifier.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree_types.h
branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
branches/ge_harmony/source/blender/makesrna/intern/rna_property.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
branches/ge_harmony/source/blender/makesrna/intern/rna_screen.c
branches/ge_harmony/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
branches/ge_harmony/source/blender/makesrna/intern/rna_tracking.c
branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
branches/ge_harmony/source/blender/makesrna/intern/rna_wm.c
branches/ge_harmony/source/blender/modifiers/CMakeLists.txt
branches/ge_harmony/source/blender/modifiers/MOD_modifiertypes.h
branches/ge_harmony/source/blender/modifiers/SConscript
branches/ge_harmony/source/blender/modifiers/intern/MOD_armature.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_bevel.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_boolean.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_cast.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_curve.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_displace.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_explode.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_hook.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_lattice.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_mirror.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_screw.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_smooth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_uvproject.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_wave.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/ge_harmony/source/blender/nodes/CMakeLists.txt
branches/ge_harmony/source/blender/nodes/NOD_composite.h
branches/ge_harmony/source/blender/nodes/NOD_shader.h
branches/ge_harmony/source/blender/nodes/composite/node_composite_tree.c
branches/ge_harmony/source/blender/nodes/composite/node_composite_util.c
branches/ge_harmony/source/blender/nodes/composite/node_composite_util.h
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_image.c
branches/ge_harmony/source/blender/nodes/intern/node_common.c
branches/ge_harmony/source/blender/nodes/shader/node_shader_util.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/ge_harmony/source/blender/nodes/texture/nodes/node_texture_output.c
branches/ge_harmony/source/blender/python/SConscript
branches/ge_harmony/source/blender/python/generic/bpy_internal_import.c
branches/ge_harmony/source/blender/python/generic/idprop_py_api.c
branches/ge_harmony/source/blender/python/intern/CMakeLists.txt
branches/ge_harmony/source/blender/python/intern/bpy.c
branches/ge_harmony/source/blender/python/intern/bpy_app.c
branches/ge_harmony/source/blender/python/intern/bpy_app_handlers.c
branches/ge_harmony/source/blender/python/intern/bpy_driver.c
branches/ge_harmony/source/blender/python/intern/bpy_interface.c
branches/ge_harmony/source/blender/python/intern/bpy_interface_atexit.c
branches/ge_harmony/source/blender/python/intern/bpy_intern_string.c
branches/ge_harmony/source/blender/python/intern/bpy_library.c
branches/ge_harmony/source/blender/python/intern/bpy_operator.c
branches/ge_harmony/source/blender/python/intern/bpy_operator_wrap.c
branches/ge_harmony/source/blender/python/intern/bpy_props.c
branches/ge_harmony/source/blender/python/intern/bpy_rna.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_anim.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_array.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_callback.c
branches/ge_harmony/source/blender/python/intern/bpy_traceback.c
branches/ge_harmony/source/blender/python/intern/bpy_util.c
branches/ge_harmony/source/blender/python/mathutils/mathutils.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.h
branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
branches/ge_harmony/source/blender/quicktime/apple/qtkit_import.m
branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
branches/ge_harmony/source/blender/quicktime/apple/quicktime_import.c
branches/ge_harmony/source/blender/render/CMakeLists.txt
branches/ge_harmony/source/blender/render/extern/include/RE_pipeline.h
branches/ge_harmony/source/blender/render/intern/include/render_types.h
branches/ge_harmony/source/blender/render/intern/include/renderpipeline.h
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_empty.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/ge_harmony/source/blender/render/intern/raytrace/vbvh.h
branches/ge_harmony/source/blender/render/intern/source/convertblender.c
branches/ge_harmony/source/blender/render/intern/source/external_engine.c
branches/ge_harmony/source/blender/render/intern/source/imagetexture.c
branches/ge_harmony/source/blender/render/intern/source/pipeline.c
branches/ge_harmony/source/blender/render/intern/source/rayshade.c
branches/ge_harmony/source/blender/render/intern/source/render_texture.c
branches/ge_harmony/source/blender/render/intern/source/rendercore.c
branches/ge_harmony/source/blender/render/intern/source/shadeoutput.c
branches/ge_harmony/source/blender/render/intern/source/zbuf.c
branches/ge_harmony/source/blender/windowmanager/WM_api.h
branches/ge_harmony/source/blender/windowmanager/intern/wm_dragdrop.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_init_exit.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_jobs.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_keymap.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
branches/ge_harmony/source/blenderplayer/CMakeLists.txt
branches/ge_harmony/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/creator/creator.c
branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/ge_harmony/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/ge_harmony/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/ge_harmony/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ge_harmony/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ge_harmony/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/ge_harmony/source/gameengine/Converter/KX_IpoConvert.cpp
branches/ge_harmony/source/gameengine/Expressions/InputParser.cpp
branches/ge_harmony/source/gameengine/Expressions/Operator1Expr.cpp
branches/ge_harmony/source/gameengine/Expressions/Operator2Expr.cpp
branches/ge_harmony/source/gameengine/Expressions/PyObjectPlus.h
branches/ge_harmony/source/gameengine/Expressions/StringValue.h
branches/ge_harmony/source/gameengine/Expressions/Value.cpp
branches/ge_harmony/source/gameengine/Expressions/Value.h
branches/ge_harmony/source/gameengine/GameLogic/CMakeLists.txt
branches/ge_harmony/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/ge_harmony/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/ge_harmony/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/ge_harmony/source/gameengine/Ketsji/BL_Material.cpp
branches/ge_harmony/source/gameengine/Ketsji/BL_Texture.cpp
branches/ge_harmony/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_CameraActuator.h
branches/ge_harmony/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_Dome.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_FontObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_GameObject.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_Scene.h
branches/ge_harmony/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/ge_harmony/source/gameengine/Rasterizer/RAS_TexVert.cpp
Added Paths:
-----------
branches/ge_harmony/extern/carve/
branches/ge_harmony/intern/boolop/intern/BOP_CarveInterface.cpp
branches/ge_harmony/intern/cycles/app/io_export_cycles_xml.py
branches/ge_harmony/intern/cycles/blender/CCL_api.h
branches/ge_harmony/intern/cycles/kernel/svm/svm_checker.h
branches/ge_harmony/intern/dualcon/
branches/ge_harmony/release/scripts/modules/rna_xml.py
branches/ge_harmony/release/scripts/presets/tracking_track_color/object.py
branches/ge_harmony/source/blender/blenlib/BLI_array.h
branches/ge_harmony/source/blender/blenlib/intern/math_color_inline.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_remesh.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/ge_harmony/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/ge_harmony/source/blender/python/intern/bpy_app_ffmpeg.c
branches/ge_harmony/source/blender/python/intern/bpy_app_ffmpeg.h
branches/ge_harmony/source/blender/render/intern/include/render_result.h
branches/ge_harmony/source/blender/render/intern/source/render_result.c
branches/ge_harmony/source/tests/bl_mesh_modifiers.py
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42866
+
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:42243-43440
Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt 2012-01-17 05:15:33 UTC (rev 43442)
+++ branches/ge_harmony/CMakeLists.txt 2012-01-17 05:22:27 UTC (rev 43443)
@@ -156,6 +156,7 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode
input)" ON)
+ option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with
blender" ON)
option(WITH_XDG_USER_DIRS "Build with XDG Base Directory
Specification (only config and documents for now)" OFF)
mark_as_advanced(WITH_XDG_USER_DIRS)
@@ -169,6 +170,7 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -206,6 +208,9 @@
# Camera/motion tracking
option(WITH_LIBMV "Enable libmv structure from motion library" ON)
+# Mesh boolean lib
+option(WITH_CARVE "Enable Carve library to handle mesh boolean
operations" ON)
+
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
@@ -268,8 +273,8 @@
message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
endif()
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
- message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT
WITH_CODEC_FFMPEG)))
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG
and WITH_CODEC_FFMPEG")
endif()
# python module, needs some different options
@@ -298,9 +303,13 @@
set(WITH_HEADLESS ON)
endif()
-# auto enable openimageio and boost for cycles
+# auto enable openimageio for cycles
if(WITH_CYCLES)
set(WITH_OPENIMAGEIO ON)
+endif()
+
+# auto enable boost for cycles and carve
+if(WITH_CYCLES OR WITH_CARVE)
set(WITH_BOOST ON)
endif()
@@ -459,7 +468,8 @@
# use lib dir if available and nothing else specified
if(LIBDIR AND NOT FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG
Directory")
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice
swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc
theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG
Libraries")
+ # XXX, some distros might need 'theoraenc theoradec' too
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice
swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis
vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
else()
set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice
swscale CACHE STRING "FFMPEG Libraries")
@@ -583,6 +593,17 @@
if(WITH_X11_XINPUT)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS}
${X11_Xinput_LIB}")
endif()
+
+ if(WITH_X11_XF86VMODE)
+ # XXX, why dont cmake make this available?
+ FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm
${X11_LIB_SEARCH_PATH})
+ mark_as_advanced(X11_Xxf86vmode_LIB)
+ if(X11_Xxf86vmode_LIB)
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS}
${X11_Xxf86vmode_LIB}")
+ else()
+ set(WITH_X11_XF86VMODE OFF)
+ endif()
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -606,6 +627,10 @@
# CLang is the same as GCC for now.
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char
-fno-strict-aliasing")
+ # Solaris CC
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+ set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC
-D__FUNCTION__=__func__")
+
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
@@ -660,7 +685,7 @@
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- set(OPENAL_LIBRARY wrap_oal)
+ set(OPENAL_LIBRARY OpenAL32)
set(OPENAL_LIBPATH ${OPENAL}/lib)
endif()
@@ -698,8 +723,8 @@
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE
/D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305
/wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305
/wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305
/wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305
/wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3
/nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -765,22 +790,27 @@
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
+
+ set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
set(OPENCOLLADA_LIBRARIES
-
${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
-
${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
-
${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
-
${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
- ${LIBDIR}/opencollada/lib/MathMLSolver.lib
- ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
- ${LIBDIR}/opencollada/lib/xml2.lib
- ${LIBDIR}/opencollada/lib/buffer.lib
- ${LIBDIR}/opencollada/lib/ftoa.lib
- ${LIBDIR}/opencollada/lib/UTF.lib
+
${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
+
${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
+ ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
+ ${OPENCOLLADA_LIBPATH}/xml2.lib
+ ${OPENCOLLADA_LIBPATH}/buffer.lib
+ ${OPENCOLLADA_LIBPATH}/ftoa.lib
+ ${OPENCOLLADA_LIBPATH}/UTF.lib
)
set(PCRE_LIBRARIES
- ${LIBDIR}/opencollada/lib/pcre.lib
+ ${OPENCOLLADA_LIBPATH}/pcre.lib
)
+
+ unset(OPENCOLLADA_LIBPATH)
+
endif()
if(WITH_CODEC_FFMPEG)
@@ -798,18 +828,8 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC90)
- set(MSVC_LIB _vs2008)
- set(MSVC_INC)
- elseif(MSVC10)
- set(MSVC_LIB _vs2010)
- set(MSVC_INC _vs2010)
- else()
- set(MSVC_LIB msvc)
- set(MSVC_INC)
- endif()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set_lib_path(OPENEXR "openexr")
+ set_lib_path(OPENEXR_LIBPATH "openexr/lib")
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib
@@ -817,7 +837,7 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+ set_lib_path(OPENEXR_INCUDE "openexr/include")
set(OPENEXR_INCLUDE_DIRS
${OPENEXR_INCUDE}
${OPENEXR_INCUDE}/IlmImf
@@ -844,9 +864,9 @@
if(WITH_PYTHON)
# normally cached but not since we include them with
blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
- set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
- set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib")
#CACHE FILEPATH)
-
+ set_lib_path(PYTHON_INCLUDE_DIR
"python/include/python${PYTHON_VERSION}")
+ set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib")
#CACHE FILEPATH)
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -879,7 +899,7 @@
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
- set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
set(OPENIMAGEIO_DEFINITIONS)
endif()
@@ -1018,9 +1038,13 @@
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
-
+
set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
+ ## DISABLE - causes linking errors
+ ## for re-distrobution, so users dont need mingw installed
+ # set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc
-static-libstdc++")
+
endif()
# used in many places so include globally, like OpenGL
@@ -1068,16 +1092,28 @@
endif()
if(WITH_PYTHON)
- # we use precompiled libraries for py 3.2 and up by default
+ if(NOT WITH_PYTHON_MODULE)
+ # we use precompiled libraries for py 3.2 and up by
default
- # normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
- set(PYTHON_LIBRARY python${PYTHON_VERSION})
- set(PYTHON_LIBPATH
"${LIBDIR}/python/lib/python${PYTHON_VERSION}")
- # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with
this enabled
+ # normally cached but not since we include them with
blender
+ set(PYTHON_VERSION 3.2)
+ set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}")
+ # set(PYTHON_BINARY
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH
"${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+ # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't
build with this enabled
+ else()
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
