[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41626] branches/soc-2011-carrot: Merge with trunk r41625
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Mon Nov 7 17:36:49 CET 2011
Revision: 41626
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41626
Author: miikah
Date: 2011-11-07 16:36:49 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Merge with trunk r41625
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41625
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/scons/tools/Blender.py
branches/soc-2011-carrot/build_files/scons/tools/btools.py
branches/soc-2011-carrot/doc/doxygen/Doxyfile
branches/soc-2011-carrot/extern/CMakeLists.txt
branches/soc-2011-carrot/extern/SConscript
branches/soc-2011-carrot/release/datafiles/blender_icons.png
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/__init__.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/source/blender/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_context.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_lattice.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_library.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_main.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_node.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_object.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_property.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_text.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenkernel/SConscript
branches/soc-2011-carrot/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/action.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/armature.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/boids.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/brush.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/context.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/curve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/displist.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/group.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/key.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/library.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/material.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mball.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/object.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/property.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/scene.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/text.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/unit.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/world.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_threads.h
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-carrot/source/blender/blenlib/intern/bpath.c
branches/soc-2011-carrot/source/blender/blenlib/intern/graph.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-carrot/source/blender/blenlib/intern/threads.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.h
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-carrot/source/blender/collada/AnimationExporter.h
branches/soc-2011-carrot/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-carrot/source/blender/editors/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/SConscript
branches/soc-2011-carrot/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_draw.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_markers.c
branches/soc-2011-carrot/source/blender/editors/animation/keyframing.c
branches/soc-2011-carrot/source/blender/editors/armature/armature_intern.h
branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-carrot/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-carrot/source/blender/editors/armature/poseUtils.c
branches/soc-2011-carrot/source/blender/editors/curve/editcurve.c
branches/soc-2011-carrot/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2011-carrot/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-carrot/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-carrot/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-carrot/source/blender/editors/include/ED_armature.h
branches/soc-2011-carrot/source/blender/editors/include/ED_fluidsim.h
branches/soc-2011-carrot/source/blender/editors/include/ED_logic.h
branches/soc-2011-carrot/source/blender/editors/include/ED_particle.h
branches/soc-2011-carrot/source/blender/editors/include/ED_space_api.h
branches/soc-2011-carrot/source/blender/editors/include/ED_transform.h
branches/soc-2011-carrot/source/blender/editors/include/ED_view3d.h
branches/soc-2011-carrot/source/blender/editors/include/UI_icons.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
branches/soc-2011-carrot/source/blender/editors/include/UI_resources.h
branches/soc-2011-carrot/source/blender/editors/interface/interface.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-carrot/source/blender/editors/interface/resources.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-carrot/source/blender/editors/object/object_add.c
branches/soc-2011-carrot/source/blender/editors/object/object_constraint.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_lattice.c
branches/soc-2011-carrot/source/blender/editors/object/object_modifier.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_object.c
branches/soc-2011-carrot/source/blender/editors/render/render_preview.c
branches/soc-2011-carrot/source/blender/editors/screen/area.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_edit.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-carrot/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/filelist.c
branches/soc-2011-carrot/source/blender/editors/space_file/filelist.h
branches/soc-2011-carrot/source/blender/editors/space_image/image_draw.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_intern.h
branches/soc-2011-carrot/source/blender/editors/space_info/textview.c
branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_intern.h
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-carrot/source/blender/editors/transform/transform.c
branches/soc-2011-carrot/source/blender/editors/transform/transform.h
branches/soc-2011-carrot/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_input.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_ops.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-carrot/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/util/crazyspace.c
branches/soc-2011-carrot/source/blender/editors/util/editmode_undo.c
branches/soc-2011-carrot/source/blender/editors/util/undo.c
branches/soc-2011-carrot/source/blender/editors/util/util_intern.h
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-carrot/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-carrot/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-carrot/source/blender/makesdna/DNA_ID.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-carrot/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-carrot/source/blender/nodes/CMakeLists.txt
branches/soc-2011-carrot/source/blender/nodes/NOD_composite.h
branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-carrot/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-carrot/source/blender/python/generic/bgl.c
branches/soc-2011-carrot/source/blender/python/generic/bgl.h
branches/soc-2011-carrot/source/blender/python/generic/blf_py_api.c
branches/soc-2011-carrot/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-carrot/source/blender/python/generic/noise_py_api.c
branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-carrot/source/blender/python/intern/bpy.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_app.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_driver.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_library.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_util.c
branches/soc-2011-carrot/source/blender/python/intern/gpu.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-carrot/source/blender/render/intern/include/rendercore.h
branches/soc-2011-carrot/source/blender/render/intern/include/zbuf.h
branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
branches/soc-2011-carrot/source/blender/render/intern/source/envmap.c
branches/soc-2011-carrot/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-carrot/source/blender/render/intern/source/initrender.c
branches/soc-2011-carrot/source/blender/render/intern/source/occlusion.c
branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
branches/soc-2011-carrot/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-carrot/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-carrot/source/blender/render/intern/source/rayshade.c
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
branches/soc-2011-carrot/source/blender/render/intern/source/rendercore.c
branches/soc-2011-carrot/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-carrot/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-carrot/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-carrot/source/blender/render/intern/source/sss.c
branches/soc-2011-carrot/source/blender/render/intern/source/strand.c
branches/soc-2011-carrot/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-carrot/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-carrot/source/blender/render/intern/source/zbuf.c
branches/soc-2011-carrot/source/blender/windowmanager/WM_types.h
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blenderplayer/CMakeLists.txt
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/creator/creator.c
branches/soc-2011-carrot/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-carrot/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2011-carrot/source/gameengine/Expressions/Expression.h
branches/soc-2011-carrot/source/gameengine/Expressions/ListValue.h
branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-carrot/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-carrot/source/gameengine/Expressions/Value.cpp
branches/soc-2011-carrot/source/gameengine/Expressions/Value.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ANDController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_NANDController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_NORController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_ORController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_XNORController.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_XORController.h
branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Light.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_StateActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_VisibilityActuator.h
Added Paths:
-----------
branches/soc-2011-carrot/extern/libmv/
branches/soc-2011-carrot/extern/libmv/CMakeLists.txt
branches/soc-2011-carrot/extern/libmv/ChangeLog
branches/soc-2011-carrot/extern/libmv/SConscript
branches/soc-2011-carrot/extern/libmv/bundle.sh
branches/soc-2011-carrot/extern/libmv/files.txt
branches/soc-2011-carrot/extern/libmv/libmv/
branches/soc-2011-carrot/extern/libmv/libmv/base/
branches/soc-2011-carrot/extern/libmv/libmv/base/id_generator.h
branches/soc-2011-carrot/extern/libmv/libmv/base/scoped_ptr.h
branches/soc-2011-carrot/extern/libmv/libmv/base/vector.h
branches/soc-2011-carrot/extern/libmv/libmv/base/vector_utils.h
branches/soc-2011-carrot/extern/libmv/libmv/image/
branches/soc-2011-carrot/extern/libmv/libmv/image/array_nd.cc
branches/soc-2011-carrot/extern/libmv/libmv/image/array_nd.h
branches/soc-2011-carrot/extern/libmv/libmv/image/convolve.cc
branches/soc-2011-carrot/extern/libmv/libmv/image/convolve.h
branches/soc-2011-carrot/extern/libmv/libmv/image/image.h
branches/soc-2011-carrot/extern/libmv/libmv/image/sample.h
branches/soc-2011-carrot/extern/libmv/libmv/image/tuple.h
branches/soc-2011-carrot/extern/libmv/libmv/logging/
branches/soc-2011-carrot/extern/libmv/libmv/logging/logging.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/
branches/soc-2011-carrot/extern/libmv/libmv/multiview/conditioning.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/conditioning.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/projection.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/projection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/resection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/triangulation.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/triangulation.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/
branches/soc-2011-carrot/extern/libmv/libmv/numeric/dogleg.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/function_derivative.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/numeric.cc
branches/soc-2011-carrot/extern/libmv/libmv/numeric/numeric.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/poly.cc
branches/soc-2011-carrot/extern/libmv/libmv/numeric/poly.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/detect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/detect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/intersect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/tracks.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/
branches/soc-2011-carrot/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/klt_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/pyramid_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/retrack_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/retrack_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/sad.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/sad.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/trklt_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv-capi.cpp
branches/soc-2011-carrot/extern/libmv/libmv-capi.h
branches/soc-2011-carrot/extern/libmv/mkfiles.sh
branches/soc-2011-carrot/extern/libmv/patches/
branches/soc-2011-carrot/extern/libmv/patches/bundle_tweaks.patch
branches/soc-2011-carrot/extern/libmv/patches/config_mac.patch
branches/soc-2011-carrot/extern/libmv/patches/detect.patch
branches/soc-2011-carrot/extern/libmv/patches/fast.patch
branches/soc-2011-carrot/extern/libmv/patches/function_derivative.patch
branches/soc-2011-carrot/extern/libmv/patches/high_distortion_crash_fix.patch
branches/soc-2011-carrot/extern/libmv/patches/levenberg_marquardt.patch
branches/soc-2011-carrot/extern/libmv/patches/mingw.patch
branches/soc-2011-carrot/extern/libmv/patches/msvc2010.patch
branches/soc-2011-carrot/extern/libmv/patches/overscan.patch
branches/soc-2011-carrot/extern/libmv/patches/scaled_distortion.patch
branches/soc-2011-carrot/extern/libmv/patches/series
branches/soc-2011-carrot/extern/libmv/patches/snrptinf_fix.patch
branches/soc-2011-carrot/extern/libmv/patches/v3d_verbosity.patch
branches/soc-2011-carrot/extern/libmv/third_party/
branches/soc-2011-carrot/extern/libmv/third_party/fast/
branches/soc-2011-carrot/extern/libmv/third_party/fast/LICENSE
branches/soc-2011-carrot/extern/libmv/third_party/fast/README
branches/soc-2011-carrot/extern/libmv/third_party/fast/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.h
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_10.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_11.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_12.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_9.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/nonmax.c
branches/soc-2011-carrot/extern/libmv/third_party/gflags/
branches/soc-2011-carrot/extern/libmv/third_party/gflags/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/gflags/config.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_completions.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_completions.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/mutex.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/AUTHORS
branches/soc-2011-carrot/extern/libmv/third_party/glog/COPYING
branches/soc-2011-carrot/extern/libmv/third_party/glog/ChangeLog
branches/soc-2011-carrot/extern/libmv/third_party/glog/NEWS
branches/soc-2011-carrot/extern/libmv/third_party/glog/README
branches/soc-2011-carrot/extern/libmv/third_party/glog/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/googleinit.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/mutex.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_linux.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_mac.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/demangle.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/demangle.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/logging.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/raw_logging.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/signalhandler.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/symbolize.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/symbolize.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/config.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/soc-2011-carrot/extern/libmv/third_party/ldl/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/CMakeLists.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Include/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Include/ldl.h
branches/soc-2011-carrot/extern/libmv/third_party/ldl/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/ldl/README.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Source/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Source/ldl.c
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/inttypes.h
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/COPYING.TXT
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/README.TXT
branches/soc-2011-carrot/extern/libmv/third_party/ssba/README.libmv
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Blender.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_500D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_550D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_5D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_600D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_60D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_7D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_Epic.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_4K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/default.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/far_plane.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/near_plane.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-carrot/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_lamp.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/camera.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-carrot/source/blender/editors/include/ED_clip.h
branches/soc-2011-carrot/source/blender/editors/space_clip/
branches/soc-2011-carrot/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_clip/SConscript
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-carrot/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-carrot/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_transform.c
Removed Paths:
-------------
branches/soc-2011-carrot/extern/libmv/CMakeLists.txt
branches/soc-2011-carrot/extern/libmv/ChangeLog
branches/soc-2011-carrot/extern/libmv/SConscript
branches/soc-2011-carrot/extern/libmv/bundle.sh
branches/soc-2011-carrot/extern/libmv/files.txt
branches/soc-2011-carrot/extern/libmv/libmv/
branches/soc-2011-carrot/extern/libmv/libmv/base/
branches/soc-2011-carrot/extern/libmv/libmv/base/id_generator.h
branches/soc-2011-carrot/extern/libmv/libmv/base/scoped_ptr.h
branches/soc-2011-carrot/extern/libmv/libmv/base/vector.h
branches/soc-2011-carrot/extern/libmv/libmv/base/vector_utils.h
branches/soc-2011-carrot/extern/libmv/libmv/image/
branches/soc-2011-carrot/extern/libmv/libmv/image/array_nd.cc
branches/soc-2011-carrot/extern/libmv/libmv/image/array_nd.h
branches/soc-2011-carrot/extern/libmv/libmv/image/convolve.cc
branches/soc-2011-carrot/extern/libmv/libmv/image/convolve.h
branches/soc-2011-carrot/extern/libmv/libmv/image/image.h
branches/soc-2011-carrot/extern/libmv/libmv/image/sample.h
branches/soc-2011-carrot/extern/libmv/libmv/image/tuple.h
branches/soc-2011-carrot/extern/libmv/libmv/logging/
branches/soc-2011-carrot/extern/libmv/libmv/logging/logging.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/
branches/soc-2011-carrot/extern/libmv/libmv/multiview/conditioning.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/conditioning.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/projection.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/projection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/resection.h
branches/soc-2011-carrot/extern/libmv/libmv/multiview/triangulation.cc
branches/soc-2011-carrot/extern/libmv/libmv/multiview/triangulation.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/
branches/soc-2011-carrot/extern/libmv/libmv/numeric/dogleg.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/function_derivative.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/numeric.cc
branches/soc-2011-carrot/extern/libmv/libmv/numeric/numeric.h
branches/soc-2011-carrot/extern/libmv/libmv/numeric/poly.cc
branches/soc-2011-carrot/extern/libmv/libmv/numeric/poly.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/bundle.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/detect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/detect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/intersect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/resect.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/resect.h
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/tracks.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/
branches/soc-2011-carrot/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/klt_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/pyramid_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/retrack_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/retrack_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/sad.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/sad.h
branches/soc-2011-carrot/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/soc-2011-carrot/extern/libmv/libmv/tracking/trklt_region_tracker.h
branches/soc-2011-carrot/extern/libmv/libmv-capi.cpp
branches/soc-2011-carrot/extern/libmv/libmv-capi.h
branches/soc-2011-carrot/extern/libmv/mkfiles.sh
branches/soc-2011-carrot/extern/libmv/patches/
branches/soc-2011-carrot/extern/libmv/patches/bundle_tweaks.patch
branches/soc-2011-carrot/extern/libmv/patches/config_mac.patch
branches/soc-2011-carrot/extern/libmv/patches/detect.patch
branches/soc-2011-carrot/extern/libmv/patches/fast.patch
branches/soc-2011-carrot/extern/libmv/patches/function_derivative.patch
branches/soc-2011-carrot/extern/libmv/patches/high_distortion_crash_fix.patch
branches/soc-2011-carrot/extern/libmv/patches/levenberg_marquardt.patch
branches/soc-2011-carrot/extern/libmv/patches/mingw.patch
branches/soc-2011-carrot/extern/libmv/patches/msvc2010.patch
branches/soc-2011-carrot/extern/libmv/patches/overscan.patch
branches/soc-2011-carrot/extern/libmv/patches/scaled_distortion.patch
branches/soc-2011-carrot/extern/libmv/patches/series
branches/soc-2011-carrot/extern/libmv/patches/snrptinf_fix.patch
branches/soc-2011-carrot/extern/libmv/patches/v3d_verbosity.patch
branches/soc-2011-carrot/extern/libmv/third_party/
branches/soc-2011-carrot/extern/libmv/third_party/fast/
branches/soc-2011-carrot/extern/libmv/third_party/fast/LICENSE
branches/soc-2011-carrot/extern/libmv/third_party/fast/README
branches/soc-2011-carrot/extern/libmv/third_party/fast/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.h
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_10.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_11.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_12.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_9.c
branches/soc-2011-carrot/extern/libmv/third_party/fast/nonmax.c
branches/soc-2011-carrot/extern/libmv/third_party/gflags/
branches/soc-2011-carrot/extern/libmv/third_party/gflags/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/gflags/config.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_completions.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_completions.h
branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/soc-2011-carrot/extern/libmv/third_party/gflags/mutex.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/AUTHORS
branches/soc-2011-carrot/extern/libmv/third_party/glog/COPYING
branches/soc-2011-carrot/extern/libmv/third_party/glog/ChangeLog
branches/soc-2011-carrot/extern/libmv/third_party/glog/NEWS
branches/soc-2011-carrot/extern/libmv/third_party/glog/README
branches/soc-2011-carrot/extern/libmv/third_party/glog/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/googleinit.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/mutex.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_linux.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_mac.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/demangle.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/demangle.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/logging.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/raw_logging.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/signalhandler.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/symbolize.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/symbolize.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/config.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.cc
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.h
branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/soc-2011-carrot/extern/libmv/third_party/ldl/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/CMakeLists.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Include/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Include/ldl.h
branches/soc-2011-carrot/extern/libmv/third_party/ldl/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/ldl/README.txt
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Source/
branches/soc-2011-carrot/extern/libmv/third_party/ldl/Source/ldl.c
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/README.libmv
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/inttypes.h
branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/COPYING.TXT
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/soc-2011-carrot/extern/libmv/third_party/ssba/README.TXT
branches/soc-2011-carrot/extern/libmv/third_party/ssba/README.libmv
branches/soc-2011-carrot/po/
branches/soc-2011-carrot/release/datafiles/locale/
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Blender.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_500D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_550D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_5D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_600D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_60D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_7D.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_Epic.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_4K.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/default.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/far_plane.py
branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/near_plane.py
branches/soc-2011-carrot/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_clip/SConscript
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_toolbar.c
branches/soc-2011-carrot/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-carrot/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-carrot/source/blender/editors/space_clip/tracking_ops.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/release/datafiles/
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-41545
+ /trunk/blender:36828-41625
Added: svn:externals
+
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-11-07 16:26:53 UTC (rev 41625)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-11-07 16:36:49 UTC (rev 41626)
@@ -202,6 +202,9 @@
option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
+# Camera/motion tracking
+option(WITH_LIBMV "Enable libmv structure from motion library" 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)
@@ -488,6 +491,36 @@
endif()
endif()
+ if(WITH_BOOST)
+ set(BOOST "/usr" CACHE PATH "Boost Directory")
+
+ if(NOT BOOST_CUSTOM)
+ set(BOOST_ROOT ${BOOST})
+ set(Boost_USE_MULTITHREADED ON)
+ find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
+ endif()
+
+ set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
+ set(BOOST_LIBRARIES ${Boost_LIBRARIES})
+ set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
+
+ set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
+ find_package(OpenImageIO REQUIRED)
+
+ set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+ set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere
+ set(OPENIMAGEIO_DEFINITIONS)
+
+ if(NOT OPENIMAGEIO_FOUND)
+ set(WITH_OPENIMAGEIO OFF)
+ endif()
+ endif()
+
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
@@ -774,6 +807,28 @@
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ set(BOOST_LIBRARIES
+ optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
+ libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set(OPENIMAGEIO_DEFINITIONS)
+ endif()
+
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
# MSVC only, Mingw doesnt need
@@ -884,6 +939,28 @@
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_POSTFIX "vc90-mt-s-1_46_1")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1")
+ set(BOOST_LIBRARIES
+ optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
+ libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set(OPENIMAGEIO_DEFINITIONS)
+ endif()
+
set(PLATFORM_LINKFLAGS "--stack,2097152")
endif()
@@ -1087,6 +1164,22 @@
# linker needs "-weak_framework 3DconnexionClient"
endif()
+ if(WITH_BOOST)
+ set(BOOST ${LIBDIR}/boost)
+ set(BOOST_INCLUDE_DIR ${BOOST}/include)
+ set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt)
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_DEFINITIONS)
+ endif()
+
+ if(WITH_OPENIMAGEIO)
+ set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+ set(OPENIMAGEIO_LIBRARIES OpenImageIO ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
+ set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
+ endif()
+
set(EXETYPE MACOSX_BUNDLE)
set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile 2011-11-07 16:26:53 UTC (rev 41625)
+++ branches/soc-2011-carrot/GNUmakefile 2011-11-07 16:36:49 UTC (rev 41626)
@@ -135,9 +135,6 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets (not assosiated with building blender)"
- @echo " * translations - update blenders translation files in po/"
- @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"
@@ -171,16 +168,6 @@
# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
- python3 po/update_pot.py
- python3 po/update_po.py
- python3 po/update_mo.py
-
-
-# -----------------------------------------------------------------------------
# Tests
#
test:
Modified: branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake 2011-11-07 16:26:53 UTC (rev 41625)
+++ branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake 2011-11-07 16:36:49 UTC (rev 41626)
@@ -13,6 +13,7 @@
set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
set(WITH_FFTW3 OFF CACHE FORCE BOOL)
+set(WITH_LIBMV OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
Modified: branches/soc-2011-carrot/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/macros.cmake 2011-11-07 16:26:53 UTC (rev 41625)
+++ branches/soc-2011-carrot/build_files/cmake/macros.cmake 2011-11-07 16:36:49 UTC (rev 41626)
@@ -165,6 +165,12 @@
if(WITH_IMAGE_TIFF)
link_directories(${TIFF_LIBPATH})
endif()
+ if(WITH_BOOST)
+ link_directories(${BOOST_LIBPATH})
+ endif()
+ if(WITH_OPENIMAGEIO)
+ link_directories(${OPENIMAGEIO_LIBPATH})
+ endif()
if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
link_directories(${OPENJPEG_LIBPATH})
endif()
@@ -259,6 +265,12 @@
if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY})
endif()
+ if(WITH_OPENIMAGEIO)
+ target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
+ endif()
+ if(WITH_BOOST)
+ target_link_libraries(${target} ${BOOST_LIBRARIES})
+ endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
@@ -618,3 +630,38 @@
endif()
endmacro()
+
+# pair of macros to allow libraries to be specify files to install, but to
+# only install them at the end so the directories don't get cleared with
+# the files in them. used by cycles to install addon.
+macro(delayed_install
+ base
+ files
+ destination)
+
+ foreach(f ${files})
+ set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
+ set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
+ endforeach()
+endmacro()
+
+# note this is a function instead of a macro so that ${BUILD_TYPE} in targetdir
+# does not get expanded in calling but is preserved
+function(delayed_do_install
+ targetdir)
+
+ get_property(files GLOBAL PROPERTY DELAYED_INSTALL_FILES)
+ get_property(destinations GLOBAL PROPERTY DELAYED_INSTALL_DESTINATIONS)
+
+ if(files)
+ list(LENGTH files n)
+ math(EXPR n "${n}-1")
+
+ foreach(i RANGE ${n})
+ list(GET files ${i} f)
+ list(GET destinations ${i} d)
+ install(FILES ${f} DESTINATION ${targetdir}/${d})
+ endforeach()
+ endif()
+endfunction()
+
Modified: branches/soc-2011-carrot/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-carrot/build_files/scons/tools/Blender.py 2011-11-07 16:26:53 UTC (rev 41625)
+++ branches/soc-2011-carrot/build_files/scons/tools/Blender.py 2011-11-07 16:36:49 UTC (rev 41626)
@@ -329,6 +329,10 @@
if env['WITH_BF_SDL']:
defs.append('WITH_SDL')
+ if env['WITH_BF_LIBMV']:
+ incs.append('#/extern/libmv')
+ defs.append('WITH_LIBMV')
+
if env['WITH_BF_PYTHON']:
incs.append('#/source/blender/python')
defs.append('WITH_PYTHON')
Modified: branches/soc-2011-carrot/build_files/scons/tools/btools.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list