[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41617] branches/cycles: Cycles: svn merge -r41531:41613 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Nov 7 16:23:09 CET 2011
Revision: 41617
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41617
Author: blendix
Date: 2011-11-07 15:23:08 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Cycles: svn merge -r41531:41613 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41531
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/GNUmakefile
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/build_files/scons/tools/btools.py
branches/cycles/doc/doxygen/Doxyfile
branches/cycles/doc/doxygen/doxygen.source
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/extern/CMakeLists.txt
branches/cycles/extern/SConscript
branches/cycles/intern/audaspace/intern/AUD_C-API.h
branches/cycles/intern/ghost/intern/GHOST_Buttons.h
branches/cycles/intern/ghost/intern/GHOST_DisplayManager.h
branches/cycles/intern/ghost/intern/GHOST_EventWheel.h
branches/cycles/release/datafiles/blender_icons.png
branches/cycles/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/cycles/release/scripts/startup/bl_operators/__init__.py
branches/cycles/release/scripts/startup/bl_operators/presets.py
branches/cycles/release/scripts/startup/bl_ui/__init__.py
branches/cycles/release/scripts/startup/bl_ui/properties_object.py
branches/cycles/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/cycles/release/scripts/startup/bl_ui/properties_scene.py
branches/cycles/release/scripts/startup/bl_ui/space_time.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/source/blender/CMakeLists.txt
branches/cycles/source/blender/blenkernel/BKE_animsys.h
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_context.h
branches/cycles/source/blender/blenkernel/BKE_customdata_file.h
branches/cycles/source/blender/blenkernel/BKE_effect.h
branches/cycles/source/blender/blenkernel/BKE_lattice.h
branches/cycles/source/blender/blenkernel/BKE_library.h
branches/cycles/source/blender/blenkernel/BKE_main.h
branches/cycles/source/blender/blenkernel/BKE_node.h
branches/cycles/source/blender/blenkernel/BKE_object.h
branches/cycles/source/blender/blenkernel/BKE_particle.h
branches/cycles/source/blender/blenkernel/BKE_pointcache.h
branches/cycles/source/blender/blenkernel/BKE_property.h
branches/cycles/source/blender/blenkernel/BKE_scene.h
branches/cycles/source/blender/blenkernel/BKE_sequencer.h
branches/cycles/source/blender/blenkernel/BKE_text.h
branches/cycles/source/blender/blenkernel/BKE_unit.h
branches/cycles/source/blender/blenkernel/BKE_writeffmpeg.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
branches/cycles/source/blender/blenkernel/intern/action.c
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/anim_sys.c
branches/cycles/source/blender/blenkernel/intern/armature.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/boids.c
branches/cycles/source/blender/blenkernel/intern/brush.c
branches/cycles/source/blender/blenkernel/intern/bvhutils.c
branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cycles/source/blender/blenkernel/intern/cloth.c
branches/cycles/source/blender/blenkernel/intern/colortools.c
branches/cycles/source/blender/blenkernel/intern/constraint.c
branches/cycles/source/blender/blenkernel/intern/context.c
branches/cycles/source/blender/blenkernel/intern/curve.c
branches/cycles/source/blender/blenkernel/intern/customdata_file.c
branches/cycles/source/blender/blenkernel/intern/depsgraph.c
branches/cycles/source/blender/blenkernel/intern/displist.c
branches/cycles/source/blender/blenkernel/intern/effect.c
branches/cycles/source/blender/blenkernel/intern/fcurve.c
branches/cycles/source/blender/blenkernel/intern/fluidsim.c
branches/cycles/source/blender/blenkernel/intern/group.c
branches/cycles/source/blender/blenkernel/intern/idcode.c
branches/cycles/source/blender/blenkernel/intern/key.c
branches/cycles/source/blender/blenkernel/intern/lattice.c
branches/cycles/source/blender/blenkernel/intern/library.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/mball.c
branches/cycles/source/blender/blenkernel/intern/mesh.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/object.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/pointcache.c
branches/cycles/source/blender/blenkernel/intern/property.c
branches/cycles/source/blender/blenkernel/intern/scene.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/shrinkwrap.c
branches/cycles/source/blender/blenkernel/intern/smoke.c
branches/cycles/source/blender/blenkernel/intern/softbody.c
branches/cycles/source/blender/blenkernel/intern/speaker.c
branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cycles/source/blender/blenkernel/intern/text.c
branches/cycles/source/blender/blenkernel/intern/texture.c
branches/cycles/source/blender/blenkernel/intern/unit.c
branches/cycles/source/blender/blenkernel/intern/world.c
branches/cycles/source/blender/blenkernel/intern/writeffmpeg.c
branches/cycles/source/blender/blenlib/BLI_kdopbvh.h
branches/cycles/source/blender/blenlib/BLI_math_vector.h
branches/cycles/source/blender/blenlib/BLI_threads.h
branches/cycles/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/cycles/source/blender/blenlib/intern/graph.c
branches/cycles/source/blender/blenlib/intern/math_vector_inline.c
branches/cycles/source/blender/blenlib/intern/pbvh.c
branches/cycles/source/blender/blenlib/intern/threads.c
branches/cycles/source/blender/blenloader/intern/readblenentry.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/readfile.h
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/collada/AnimationExporter.cpp
branches/cycles/source/blender/collada/AnimationExporter.h
branches/cycles/source/blender/collada/DocumentImporter.cpp
branches/cycles/source/blender/editors/CMakeLists.txt
branches/cycles/source/blender/editors/SConscript
branches/cycles/source/blender/editors/animation/anim_channels_defines.c
branches/cycles/source/blender/editors/animation/anim_draw.c
branches/cycles/source/blender/editors/animation/anim_markers.c
branches/cycles/source/blender/editors/animation/keyframing.c
branches/cycles/source/blender/editors/armature/armature_intern.h
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/editarmature_retarget.c
branches/cycles/source/blender/editors/armature/editarmature_sketch.c
branches/cycles/source/blender/editors/armature/meshlaplacian.c
branches/cycles/source/blender/editors/armature/poseUtils.c
branches/cycles/source/blender/editors/curve/editcurve.c
branches/cycles/source/blender/editors/datafiles/blender_icons.png.c
branches/cycles/source/blender/editors/gpencil/drawgpencil.c
branches/cycles/source/blender/editors/gpencil/editaction_gpencil.c
branches/cycles/source/blender/editors/gpencil/gpencil_edit.c
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/include/ED_anim_api.h
branches/cycles/source/blender/editors/include/ED_armature.h
branches/cycles/source/blender/editors/include/ED_fluidsim.h
branches/cycles/source/blender/editors/include/ED_logic.h
branches/cycles/source/blender/editors/include/ED_particle.h
branches/cycles/source/blender/editors/include/ED_space_api.h
branches/cycles/source/blender/editors/include/ED_transform.h
branches/cycles/source/blender/editors/include/ED_view3d.h
branches/cycles/source/blender/editors/include/UI_icons.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/include/UI_resources.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/interface_widgets.c
branches/cycles/source/blender/editors/interface/resources.c
branches/cycles/source/blender/editors/mesh/editmesh.c
branches/cycles/source/blender/editors/mesh/editmesh_tools.c
branches/cycles/source/blender/editors/object/object_add.c
branches/cycles/source/blender/editors/object/object_constraint.c
branches/cycles/source/blender/editors/object/object_edit.c
branches/cycles/source/blender/editors/object/object_lattice.c
branches/cycles/source/blender/editors/object/object_modifier.c
branches/cycles/source/blender/editors/object/object_relations.c
branches/cycles/source/blender/editors/object/object_transform.c
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/particle_object.c
branches/cycles/source/blender/editors/render/render_preview.c
branches/cycles/source/blender/editors/screen/area.c
branches/cycles/source/blender/editors/screen/screen_edit.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/paint_utils.c
branches/cycles/source/blender/editors/sculpt_paint/sculpt.c
branches/cycles/source/blender/editors/space_api/spacetypes.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_file/filelist.h
branches/cycles/source/blender/editors/space_graph/graph_draw.c
branches/cycles/source/blender/editors/space_image/image_draw.c
branches/cycles/source/blender/editors/space_image/image_intern.h
branches/cycles/source/blender/editors/space_info/textview.c
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_intern.h
branches/cycles/source/blender/editors/space_view3d/drawarmature.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/drawvolume.c
branches/cycles/source/blender/editors/space_view3d/space_view3d.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
branches/cycles/source/blender/editors/space_view3d/view3d_header.c
branches/cycles/source/blender/editors/space_view3d/view3d_intern.h
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform.h
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/editors/transform/transform_input.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/editors/transform/transform_orientations.c
branches/cycles/source/blender/editors/util/CMakeLists.txt
branches/cycles/source/blender/editors/util/crazyspace.c
branches/cycles/source/blender/editors/util/editmode_undo.c
branches/cycles/source/blender/editors/util/undo.c
branches/cycles/source/blender/editors/util/util_intern.h
branches/cycles/source/blender/editors/uvedit/uvedit_draw.c
branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
branches/cycles/source/blender/gpu/GPU_buffers.h
branches/cycles/source/blender/gpu/intern/gpu_buffers.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/ikplugin/intern/iksolver_plugin.c
branches/cycles/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/cycles/source/blender/imbuf/intern/moviecache.c
branches/cycles/source/blender/makesdna/DNA_ID.h
branches/cycles/source/blender/makesdna/DNA_action_types.h
branches/cycles/source/blender/makesdna/DNA_constraint_types.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_scene_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_userdef_types.h
branches/cycles/source/blender/makesdna/DNA_view3d_types.h
branches/cycles/source/blender/makesdna/intern/makesdna.c
branches/cycles/source/blender/makesrna/RNA_access.h
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/makesrna.c
branches/cycles/source/blender/makesrna/intern/rna_ID.c
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_armature.c
branches/cycles/source/blender/makesrna/intern/rna_camera_api.c
branches/cycles/source/blender/makesrna/intern/rna_color.c
branches/cycles/source/blender/makesrna/intern/rna_constraint.c
branches/cycles/source/blender/makesrna/intern/rna_internal.h
branches/cycles/source/blender/makesrna/intern/rna_main.c
branches/cycles/source/blender/makesrna/intern/rna_main_api.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree_types.h
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_screen.c
branches/cycles/source/blender/makesrna/intern/rna_space.c
branches/cycles/source/blender/makesrna/intern/rna_ui_api.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/modifiers/intern/MOD_build.c
branches/cycles/source/blender/modifiers/intern/MOD_explode.c
branches/cycles/source/blender/modifiers/intern/MOD_particleinstance.c
branches/cycles/source/blender/modifiers/intern/MOD_simpledeform.c
branches/cycles/source/blender/nodes/CMakeLists.txt
branches/cycles/source/blender/nodes/NOD_composite.h
branches/cycles/source/blender/nodes/composite/node_composite_tree.c
branches/cycles/source/blender/nodes/composite/node_composite_util.c
branches/cycles/source/blender/nodes/composite/node_composite_util.h
branches/cycles/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_image.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/cycles/source/blender/nodes/shader/node_shader_util.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_material.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_image.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/cycles/source/blender/python/generic/bgl.c
branches/cycles/source/blender/python/generic/bgl.h
branches/cycles/source/blender/python/generic/blf_py_api.c
branches/cycles/source/blender/python/generic/bpy_internal_import.c
branches/cycles/source/blender/python/generic/noise_py_api.c
branches/cycles/source/blender/python/generic/py_capi_utils.c
branches/cycles/source/blender/python/intern/bpy.c
branches/cycles/source/blender/python/intern/bpy_app.c
branches/cycles/source/blender/python/intern/bpy_app_handlers.c
branches/cycles/source/blender/python/intern/bpy_driver.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/intern/bpy_interface_atexit.c
branches/cycles/source/blender/python/intern/bpy_intern_string.c
branches/cycles/source/blender/python/intern/bpy_library.c
branches/cycles/source/blender/python/intern/bpy_operator.c
branches/cycles/source/blender/python/intern/bpy_operator_wrap.c
branches/cycles/source/blender/python/intern/bpy_props.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_rna_anim.c
branches/cycles/source/blender/python/intern/bpy_rna_array.c
branches/cycles/source/blender/python/intern/bpy_rna_callback.c
branches/cycles/source/blender/python/intern/bpy_traceback.c
branches/cycles/source/blender/python/intern/bpy_util.c
branches/cycles/source/blender/python/intern/gpu.c
branches/cycles/source/blender/python/mathutils/mathutils.c
branches/cycles/source/blender/python/mathutils/mathutils.h
branches/cycles/source/blender/python/mathutils/mathutils_Color.c
branches/cycles/source/blender/python/mathutils/mathutils_Color.h
branches/cycles/source/blender/python/mathutils/mathutils_Euler.c
branches/cycles/source/blender/python/mathutils/mathutils_Euler.h
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.c
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.h
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.h
branches/cycles/source/blender/python/mathutils/mathutils_Vector.c
branches/cycles/source/blender/python/mathutils/mathutils_Vector.h
branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
branches/cycles/source/blender/python/mathutils/mathutils_geometry.h
branches/cycles/source/blender/render/intern/include/rendercore.h
branches/cycles/source/blender/render/intern/include/texture.h
branches/cycles/source/blender/render/intern/include/zbuf.h
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/envmap.c
branches/cycles/source/blender/render/intern/source/external_engine.c
branches/cycles/source/blender/render/intern/source/imagetexture.c
branches/cycles/source/blender/render/intern/source/initrender.c
branches/cycles/source/blender/render/intern/source/occlusion.c
branches/cycles/source/blender/render/intern/source/pipeline.c
branches/cycles/source/blender/render/intern/source/pixelshading.c
branches/cycles/source/blender/render/intern/source/pointdensity.c
branches/cycles/source/blender/render/intern/source/rayshade.c
branches/cycles/source/blender/render/intern/source/render_texture.c
branches/cycles/source/blender/render/intern/source/rendercore.c
branches/cycles/source/blender/render/intern/source/shadbuf.c
branches/cycles/source/blender/render/intern/source/shadeinput.c
branches/cycles/source/blender/render/intern/source/shadeoutput.c
branches/cycles/source/blender/render/intern/source/sss.c
branches/cycles/source/blender/render/intern/source/strand.c
branches/cycles/source/blender/render/intern/source/volume_precache.c
branches/cycles/source/blender/render/intern/source/voxeldata.c
branches/cycles/source/blender/render/intern/source/zbuf.c
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blenderplayer/CMakeLists.txt
branches/cycles/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/creator/creator.c
branches/cycles/source/gameengine/Converter/BL_ActionActuator.cpp
branches/cycles/source/gameengine/Converter/BL_ActionActuator.h
branches/cycles/source/gameengine/Converter/BL_ArmatureActuator.h
branches/cycles/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.h
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/cycles/source/gameengine/Expressions/Expression.h
branches/cycles/source/gameengine/Expressions/ListValue.h
branches/cycles/source/gameengine/Expressions/PyObjectPlus.cpp
branches/cycles/source/gameengine/Expressions/PyObjectPlus.h
branches/cycles/source/gameengine/Expressions/Value.cpp
branches/cycles/source/gameengine/Expressions/Value.h
branches/cycles/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/cycles/source/gameengine/GameLogic/SCA_ANDController.h
branches/cycles/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/cycles/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/cycles/source/gameengine/GameLogic/SCA_IController.h
branches/cycles/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/cycles/source/gameengine/GameLogic/SCA_IObject.h
branches/cycles/source/gameengine/GameLogic/SCA_ISensor.h
branches/cycles/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_NANDController.h
branches/cycles/source/gameengine/GameLogic/SCA_NORController.h
branches/cycles/source/gameengine/GameLogic/SCA_ORController.h
branches/cycles/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/cycles/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/cycles/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/cycles/source/gameengine/GameLogic/SCA_PythonController.h
branches/cycles/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/cycles/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/cycles/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/cycles/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/cycles/source/gameengine/GameLogic/SCA_XNORController.h
branches/cycles/source/gameengine/GameLogic/SCA_XORController.h
branches/cycles/source/gameengine/Ketsji/BL_Shader.h
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/cycles/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/cycles/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/cycles/source/gameengine/Ketsji/KX_Camera.h
branches/cycles/source/gameengine/Ketsji/KX_CameraActuator.h
branches/cycles/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/cycles/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/cycles/source/gameengine/Ketsji/KX_FontObject.h
branches/cycles/source/gameengine/Ketsji/KX_GameActuator.h
branches/cycles/source/gameengine/Ketsji/KX_GameObject.cpp
branches/cycles/source/gameengine/Ketsji/KX_GameObject.h
branches/cycles/source/gameengine/Ketsji/KX_IpoActuator.h
branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/cycles/source/gameengine/Ketsji/KX_Light.h
branches/cycles/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/cycles/source/gameengine/Ketsji/KX_MeshProxy.h
branches/cycles/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/cycles/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/cycles/source/gameengine/Ketsji/KX_NearSensor.h
branches/cycles/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/cycles/source/gameengine/Ketsji/KX_ParentActuator.h
branches/cycles/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/cycles/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/cycles/source/gameengine/Ketsji/KX_PolyProxy.h
branches/cycles/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/cycles/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/cycles/source/gameengine/Ketsji/KX_RadarSensor.h
branches/cycles/source/gameengine/Ketsji/KX_RaySensor.h
branches/cycles/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/cycles/source/gameengine/Ketsji/KX_Scene.cpp
branches/cycles/source/gameengine/Ketsji/KX_Scene.h
branches/cycles/source/gameengine/Ketsji/KX_SceneActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SoundActuator.h
branches/cycles/source/gameengine/Ketsji/KX_StateActuator.h
branches/cycles/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/cycles/source/gameengine/Ketsji/KX_TouchSensor.h
branches/cycles/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/cycles/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/cycles/source/gameengine/Ketsji/KX_VertexProxy.h
branches/cycles/source/gameengine/Ketsji/KX_VisibilityActuator.h
Added Paths:
-----------
branches/cycles/extern/libmv/
branches/cycles/extern/libmv/CMakeLists.txt
branches/cycles/extern/libmv/ChangeLog
branches/cycles/extern/libmv/SConscript
branches/cycles/extern/libmv/bundle.sh
branches/cycles/extern/libmv/files.txt
branches/cycles/extern/libmv/libmv/
branches/cycles/extern/libmv/libmv/base/
branches/cycles/extern/libmv/libmv/base/id_generator.h
branches/cycles/extern/libmv/libmv/base/scoped_ptr.h
branches/cycles/extern/libmv/libmv/base/vector.h
branches/cycles/extern/libmv/libmv/base/vector_utils.h
branches/cycles/extern/libmv/libmv/image/
branches/cycles/extern/libmv/libmv/image/array_nd.cc
branches/cycles/extern/libmv/libmv/image/array_nd.h
branches/cycles/extern/libmv/libmv/image/convolve.cc
branches/cycles/extern/libmv/libmv/image/convolve.h
branches/cycles/extern/libmv/libmv/image/image.h
branches/cycles/extern/libmv/libmv/image/sample.h
branches/cycles/extern/libmv/libmv/image/tuple.h
branches/cycles/extern/libmv/libmv/logging/
branches/cycles/extern/libmv/libmv/logging/logging.h
branches/cycles/extern/libmv/libmv/multiview/
branches/cycles/extern/libmv/libmv/multiview/conditioning.cc
branches/cycles/extern/libmv/libmv/multiview/conditioning.h
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.h
branches/cycles/extern/libmv/libmv/multiview/fundamental.cc
branches/cycles/extern/libmv/libmv/multiview/fundamental.h
branches/cycles/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/cycles/extern/libmv/libmv/multiview/projection.cc
branches/cycles/extern/libmv/libmv/multiview/projection.h
branches/cycles/extern/libmv/libmv/multiview/resection.h
branches/cycles/extern/libmv/libmv/multiview/triangulation.cc
branches/cycles/extern/libmv/libmv/multiview/triangulation.h
branches/cycles/extern/libmv/libmv/numeric/
branches/cycles/extern/libmv/libmv/numeric/dogleg.h
branches/cycles/extern/libmv/libmv/numeric/function_derivative.h
branches/cycles/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/cycles/extern/libmv/libmv/numeric/numeric.cc
branches/cycles/extern/libmv/libmv/numeric/numeric.h
branches/cycles/extern/libmv/libmv/numeric/poly.cc
branches/cycles/extern/libmv/libmv/numeric/poly.h
branches/cycles/extern/libmv/libmv/simple_pipeline/
branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.h
branches/cycles/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/cycles/extern/libmv/libmv/simple_pipeline/detect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/detect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/intersect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/cycles/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/resect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/resect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/tracks.h
branches/cycles/extern/libmv/libmv/tracking/
branches/cycles/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/klt_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/pyramid_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/retrack_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/retrack_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/sad.cc
branches/cycles/extern/libmv/libmv/tracking/sad.h
branches/cycles/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/trklt_region_tracker.h
branches/cycles/extern/libmv/libmv-capi.cpp
branches/cycles/extern/libmv/libmv-capi.h
branches/cycles/extern/libmv/mkfiles.sh
branches/cycles/extern/libmv/patches/
branches/cycles/extern/libmv/patches/bundle_tweaks.patch
branches/cycles/extern/libmv/patches/config_mac.patch
branches/cycles/extern/libmv/patches/detect.patch
branches/cycles/extern/libmv/patches/fast.patch
branches/cycles/extern/libmv/patches/function_derivative.patch
branches/cycles/extern/libmv/patches/high_distortion_crash_fix.patch
branches/cycles/extern/libmv/patches/levenberg_marquardt.patch
branches/cycles/extern/libmv/patches/mingw.patch
branches/cycles/extern/libmv/patches/msvc2010.patch
branches/cycles/extern/libmv/patches/overscan.patch
branches/cycles/extern/libmv/patches/scaled_distortion.patch
branches/cycles/extern/libmv/patches/series
branches/cycles/extern/libmv/patches/snrptinf_fix.patch
branches/cycles/extern/libmv/patches/v3d_verbosity.patch
branches/cycles/extern/libmv/third_party/
branches/cycles/extern/libmv/third_party/fast/
branches/cycles/extern/libmv/third_party/fast/LICENSE
branches/cycles/extern/libmv/third_party/fast/README
branches/cycles/extern/libmv/third_party/fast/README.libmv
branches/cycles/extern/libmv/third_party/fast/fast.c
branches/cycles/extern/libmv/third_party/fast/fast.h
branches/cycles/extern/libmv/third_party/fast/fast_10.c
branches/cycles/extern/libmv/third_party/fast/fast_11.c
branches/cycles/extern/libmv/third_party/fast/fast_12.c
branches/cycles/extern/libmv/third_party/fast/fast_9.c
branches/cycles/extern/libmv/third_party/fast/nonmax.c
branches/cycles/extern/libmv/third_party/gflags/
branches/cycles/extern/libmv/third_party/gflags/README.libmv
branches/cycles/extern/libmv/third_party/gflags/config.h
branches/cycles/extern/libmv/third_party/gflags/gflags.cc
branches/cycles/extern/libmv/third_party/gflags/gflags.h
branches/cycles/extern/libmv/third_party/gflags/gflags_completions.cc
branches/cycles/extern/libmv/third_party/gflags/gflags_completions.h
branches/cycles/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/cycles/extern/libmv/third_party/gflags/mutex.h
branches/cycles/extern/libmv/third_party/glog/
branches/cycles/extern/libmv/third_party/glog/AUTHORS
branches/cycles/extern/libmv/third_party/glog/COPYING
branches/cycles/extern/libmv/third_party/glog/ChangeLog
branches/cycles/extern/libmv/third_party/glog/NEWS
branches/cycles/extern/libmv/third_party/glog/README
branches/cycles/extern/libmv/third_party/glog/README.libmv
branches/cycles/extern/libmv/third_party/glog/src/
branches/cycles/extern/libmv/third_party/glog/src/base/
branches/cycles/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/cycles/extern/libmv/third_party/glog/src/base/googleinit.h
branches/cycles/extern/libmv/third_party/glog/src/base/mutex.h
branches/cycles/extern/libmv/third_party/glog/src/config.h
branches/cycles/extern/libmv/third_party/glog/src/config_linux.h
branches/cycles/extern/libmv/third_party/glog/src/config_mac.h
branches/cycles/extern/libmv/third_party/glog/src/demangle.cc
branches/cycles/extern/libmv/third_party/glog/src/demangle.h
branches/cycles/extern/libmv/third_party/glog/src/glog/
branches/cycles/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/logging.cc
branches/cycles/extern/libmv/third_party/glog/src/raw_logging.cc
branches/cycles/extern/libmv/third_party/glog/src/signalhandler.cc
branches/cycles/extern/libmv/third_party/glog/src/stacktrace.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/cycles/extern/libmv/third_party/glog/src/symbolize.cc
branches/cycles/extern/libmv/third_party/glog/src/symbolize.h
branches/cycles/extern/libmv/third_party/glog/src/utilities.cc
branches/cycles/extern/libmv/third_party/glog/src/utilities.h
branches/cycles/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/cycles/extern/libmv/third_party/glog/src/windows/
branches/cycles/extern/libmv/third_party/glog/src/windows/config.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/windows/port.cc
branches/cycles/extern/libmv/third_party/glog/src/windows/port.h
branches/cycles/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/cycles/extern/libmv/third_party/ldl/
branches/cycles/extern/libmv/third_party/ldl/CMakeLists.txt
branches/cycles/extern/libmv/third_party/ldl/Doc/
branches/cycles/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/cycles/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/cycles/extern/libmv/third_party/ldl/Include/
branches/cycles/extern/libmv/third_party/ldl/Include/ldl.h
branches/cycles/extern/libmv/third_party/ldl/README.libmv
branches/cycles/extern/libmv/third_party/ldl/README.txt
branches/cycles/extern/libmv/third_party/ldl/Source/
branches/cycles/extern/libmv/third_party/ldl/Source/ldl.c
branches/cycles/extern/libmv/third_party/msinttypes/
branches/cycles/extern/libmv/third_party/msinttypes/README.libmv
branches/cycles/extern/libmv/third_party/msinttypes/inttypes.h
branches/cycles/extern/libmv/third_party/msinttypes/stdint.h
branches/cycles/extern/libmv/third_party/ssba/
branches/cycles/extern/libmv/third_party/ssba/COPYING.TXT
branches/cycles/extern/libmv/third_party/ssba/Geometry/
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/cycles/extern/libmv/third_party/ssba/Math/
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/cycles/extern/libmv/third_party/ssba/README.TXT
branches/cycles/extern/libmv/third_party/ssba/README.libmv
branches/cycles/release/scripts/presets/tracking_camera/
branches/cycles/release/scripts/presets/tracking_camera/Blender.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_500D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_550D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_5D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_600D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_60D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_7D.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/cycles/release/scripts/presets/tracking_camera/Red_Epic.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_4K.py
branches/cycles/release/scripts/presets/tracking_track_color/
branches/cycles/release/scripts/presets/tracking_track_color/default.py
branches/cycles/release/scripts/presets/tracking_track_color/far_plane.py
branches/cycles/release/scripts/presets/tracking_track_color/near_plane.py
branches/cycles/release/scripts/startup/bl_operators/clip.py
branches/cycles/release/scripts/startup/bl_ui/space_clip.py
branches/cycles/source/blender/blenkernel/BKE_camera.h
branches/cycles/source/blender/blenkernel/BKE_lamp.h
branches/cycles/source/blender/blenkernel/BKE_movieclip.h
branches/cycles/source/blender/blenkernel/BKE_tracking.h
branches/cycles/source/blender/blenkernel/intern/camera.c
branches/cycles/source/blender/blenkernel/intern/lamp.c
branches/cycles/source/blender/blenkernel/intern/movieclip.c
branches/cycles/source/blender/blenkernel/intern/tracking.c
branches/cycles/source/blender/editors/include/ED_clip.h
branches/cycles/source/blender/editors/space_clip/
branches/cycles/source/blender/editors/space_clip/CMakeLists.txt
branches/cycles/source/blender/editors/space_clip/SConscript
branches/cycles/source/blender/editors/space_clip/clip_buttons.c
branches/cycles/source/blender/editors/space_clip/clip_draw.c
branches/cycles/source/blender/editors/space_clip/clip_editor.c
branches/cycles/source/blender/editors/space_clip/clip_graph_draw.c
branches/cycles/source/blender/editors/space_clip/clip_graph_ops.c
branches/cycles/source/blender/editors/space_clip/clip_intern.h
branches/cycles/source/blender/editors/space_clip/clip_ops.c
branches/cycles/source/blender/editors/space_clip/clip_toolbar.c
branches/cycles/source/blender/editors/space_clip/clip_utils.c
branches/cycles/source/blender/editors/space_clip/space_clip.c
branches/cycles/source/blender/editors/space_clip/tracking_ops.c
branches/cycles/source/blender/makesdna/DNA_movieclip_types.h
branches/cycles/source/blender/makesdna/DNA_tracking_types.h
branches/cycles/source/blender/makesrna/intern/rna_movieclip.c
branches/cycles/source/blender/makesrna/intern/rna_tracking.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_transform.c
Removed Paths:
-------------
branches/cycles/extern/libmv/CMakeLists.txt
branches/cycles/extern/libmv/ChangeLog
branches/cycles/extern/libmv/SConscript
branches/cycles/extern/libmv/bundle.sh
branches/cycles/extern/libmv/files.txt
branches/cycles/extern/libmv/libmv/
branches/cycles/extern/libmv/libmv/base/
branches/cycles/extern/libmv/libmv/base/id_generator.h
branches/cycles/extern/libmv/libmv/base/scoped_ptr.h
branches/cycles/extern/libmv/libmv/base/vector.h
branches/cycles/extern/libmv/libmv/base/vector_utils.h
branches/cycles/extern/libmv/libmv/image/
branches/cycles/extern/libmv/libmv/image/array_nd.cc
branches/cycles/extern/libmv/libmv/image/array_nd.h
branches/cycles/extern/libmv/libmv/image/convolve.cc
branches/cycles/extern/libmv/libmv/image/convolve.h
branches/cycles/extern/libmv/libmv/image/image.h
branches/cycles/extern/libmv/libmv/image/sample.h
branches/cycles/extern/libmv/libmv/image/tuple.h
branches/cycles/extern/libmv/libmv/logging/
branches/cycles/extern/libmv/libmv/logging/logging.h
branches/cycles/extern/libmv/libmv/multiview/
branches/cycles/extern/libmv/libmv/multiview/conditioning.cc
branches/cycles/extern/libmv/libmv/multiview/conditioning.h
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/cycles/extern/libmv/libmv/multiview/euclidean_resection.h
branches/cycles/extern/libmv/libmv/multiview/fundamental.cc
branches/cycles/extern/libmv/libmv/multiview/fundamental.h
branches/cycles/extern/libmv/libmv/multiview/nviewtriangulation.h
branches/cycles/extern/libmv/libmv/multiview/projection.cc
branches/cycles/extern/libmv/libmv/multiview/projection.h
branches/cycles/extern/libmv/libmv/multiview/resection.h
branches/cycles/extern/libmv/libmv/multiview/triangulation.cc
branches/cycles/extern/libmv/libmv/multiview/triangulation.h
branches/cycles/extern/libmv/libmv/numeric/
branches/cycles/extern/libmv/libmv/numeric/dogleg.h
branches/cycles/extern/libmv/libmv/numeric/function_derivative.h
branches/cycles/extern/libmv/libmv/numeric/levenberg_marquardt.h
branches/cycles/extern/libmv/libmv/numeric/numeric.cc
branches/cycles/extern/libmv/libmv/numeric/numeric.h
branches/cycles/extern/libmv/libmv/numeric/poly.cc
branches/cycles/extern/libmv/libmv/numeric/poly.h
branches/cycles/extern/libmv/libmv/simple_pipeline/
branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/bundle.h
branches/cycles/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
branches/cycles/extern/libmv/libmv/simple_pipeline/detect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/detect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/intersect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/intersect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/pipeline.h
branches/cycles/extern/libmv/libmv/simple_pipeline/reconstruction.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/reconstruction.h
branches/cycles/extern/libmv/libmv/simple_pipeline/resect.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/resect.h
branches/cycles/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/cycles/extern/libmv/libmv/simple_pipeline/tracks.h
branches/cycles/extern/libmv/libmv/tracking/
branches/cycles/extern/libmv/libmv/tracking/klt_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/klt_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/pyramid_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/retrack_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/retrack_region_tracker.h
branches/cycles/extern/libmv/libmv/tracking/sad.cc
branches/cycles/extern/libmv/libmv/tracking/sad.h
branches/cycles/extern/libmv/libmv/tracking/trklt_region_tracker.cc
branches/cycles/extern/libmv/libmv/tracking/trklt_region_tracker.h
branches/cycles/extern/libmv/libmv-capi.cpp
branches/cycles/extern/libmv/libmv-capi.h
branches/cycles/extern/libmv/mkfiles.sh
branches/cycles/extern/libmv/patches/
branches/cycles/extern/libmv/patches/bundle_tweaks.patch
branches/cycles/extern/libmv/patches/config_mac.patch
branches/cycles/extern/libmv/patches/detect.patch
branches/cycles/extern/libmv/patches/fast.patch
branches/cycles/extern/libmv/patches/function_derivative.patch
branches/cycles/extern/libmv/patches/high_distortion_crash_fix.patch
branches/cycles/extern/libmv/patches/levenberg_marquardt.patch
branches/cycles/extern/libmv/patches/mingw.patch
branches/cycles/extern/libmv/patches/msvc2010.patch
branches/cycles/extern/libmv/patches/overscan.patch
branches/cycles/extern/libmv/patches/scaled_distortion.patch
branches/cycles/extern/libmv/patches/series
branches/cycles/extern/libmv/patches/snrptinf_fix.patch
branches/cycles/extern/libmv/patches/v3d_verbosity.patch
branches/cycles/extern/libmv/third_party/
branches/cycles/extern/libmv/third_party/fast/
branches/cycles/extern/libmv/third_party/fast/LICENSE
branches/cycles/extern/libmv/third_party/fast/README
branches/cycles/extern/libmv/third_party/fast/README.libmv
branches/cycles/extern/libmv/third_party/fast/fast.c
branches/cycles/extern/libmv/third_party/fast/fast.h
branches/cycles/extern/libmv/third_party/fast/fast_10.c
branches/cycles/extern/libmv/third_party/fast/fast_11.c
branches/cycles/extern/libmv/third_party/fast/fast_12.c
branches/cycles/extern/libmv/third_party/fast/fast_9.c
branches/cycles/extern/libmv/third_party/fast/nonmax.c
branches/cycles/extern/libmv/third_party/gflags/
branches/cycles/extern/libmv/third_party/gflags/README.libmv
branches/cycles/extern/libmv/third_party/gflags/config.h
branches/cycles/extern/libmv/third_party/gflags/gflags.cc
branches/cycles/extern/libmv/third_party/gflags/gflags.h
branches/cycles/extern/libmv/third_party/gflags/gflags_completions.cc
branches/cycles/extern/libmv/third_party/gflags/gflags_completions.h
branches/cycles/extern/libmv/third_party/gflags/gflags_reporting.cc
branches/cycles/extern/libmv/third_party/gflags/mutex.h
branches/cycles/extern/libmv/third_party/glog/
branches/cycles/extern/libmv/third_party/glog/AUTHORS
branches/cycles/extern/libmv/third_party/glog/COPYING
branches/cycles/extern/libmv/third_party/glog/ChangeLog
branches/cycles/extern/libmv/third_party/glog/NEWS
branches/cycles/extern/libmv/third_party/glog/README
branches/cycles/extern/libmv/third_party/glog/README.libmv
branches/cycles/extern/libmv/third_party/glog/src/
branches/cycles/extern/libmv/third_party/glog/src/base/
branches/cycles/extern/libmv/third_party/glog/src/base/commandlineflags.h
branches/cycles/extern/libmv/third_party/glog/src/base/googleinit.h
branches/cycles/extern/libmv/third_party/glog/src/base/mutex.h
branches/cycles/extern/libmv/third_party/glog/src/config.h
branches/cycles/extern/libmv/third_party/glog/src/config_linux.h
branches/cycles/extern/libmv/third_party/glog/src/config_mac.h
branches/cycles/extern/libmv/third_party/glog/src/demangle.cc
branches/cycles/extern/libmv/third_party/glog/src/demangle.h
branches/cycles/extern/libmv/third_party/glog/src/glog/
branches/cycles/extern/libmv/third_party/glog/src/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/logging.cc
branches/cycles/extern/libmv/third_party/glog/src/raw_logging.cc
branches/cycles/extern/libmv/third_party/glog/src/signalhandler.cc
branches/cycles/extern/libmv/third_party/glog/src/stacktrace.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
branches/cycles/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/cycles/extern/libmv/third_party/glog/src/symbolize.cc
branches/cycles/extern/libmv/third_party/glog/src/symbolize.h
branches/cycles/extern/libmv/third_party/glog/src/utilities.cc
branches/cycles/extern/libmv/third_party/glog/src/utilities.h
branches/cycles/extern/libmv/third_party/glog/src/vlog_is_on.cc
branches/cycles/extern/libmv/third_party/glog/src/windows/
branches/cycles/extern/libmv/third_party/glog/src/windows/config.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
branches/cycles/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
branches/cycles/extern/libmv/third_party/glog/src/windows/port.cc
branches/cycles/extern/libmv/third_party/glog/src/windows/port.h
branches/cycles/extern/libmv/third_party/glog/src/windows/preprocess.sh
branches/cycles/extern/libmv/third_party/ldl/
branches/cycles/extern/libmv/third_party/ldl/CMakeLists.txt
branches/cycles/extern/libmv/third_party/ldl/Doc/
branches/cycles/extern/libmv/third_party/ldl/Doc/ChangeLog
branches/cycles/extern/libmv/third_party/ldl/Doc/lesser.txt
branches/cycles/extern/libmv/third_party/ldl/Include/
branches/cycles/extern/libmv/third_party/ldl/Include/ldl.h
branches/cycles/extern/libmv/third_party/ldl/README.libmv
branches/cycles/extern/libmv/third_party/ldl/README.txt
branches/cycles/extern/libmv/third_party/ldl/Source/
branches/cycles/extern/libmv/third_party/ldl/Source/ldl.c
branches/cycles/extern/libmv/third_party/msinttypes/
branches/cycles/extern/libmv/third_party/msinttypes/README.libmv
branches/cycles/extern/libmv/third_party/msinttypes/inttypes.h
branches/cycles/extern/libmv/third_party/msinttypes/stdint.h
branches/cycles/extern/libmv/third_party/ssba/
branches/cycles/extern/libmv/third_party/ssba/COPYING.TXT
branches/cycles/extern/libmv/third_party/ssba/Geometry/
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
branches/cycles/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
branches/cycles/extern/libmv/third_party/ssba/Math/
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
branches/cycles/extern/libmv/third_party/ssba/Math/v3d_optimization.h
branches/cycles/extern/libmv/third_party/ssba/README.TXT
branches/cycles/extern/libmv/third_party/ssba/README.libmv
branches/cycles/po/
branches/cycles/release/datafiles/locale/
branches/cycles/release/scripts/presets/tracking_camera/Blender.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1100D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_1DS.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_500D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_550D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_5D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_600D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_60D.py
branches/cycles/release/scripts/presets/tracking_camera/Canon_7D.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D300S.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D3100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D35.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D5100.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D7000.py
branches/cycles/release/scripts/presets/tracking_camera/Nikon_D90.py
branches/cycles/release/scripts/presets/tracking_camera/Red_Epic.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_2K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_3K.py
branches/cycles/release/scripts/presets/tracking_camera/Red_One_4K.py
branches/cycles/release/scripts/presets/tracking_track_color/default.py
branches/cycles/release/scripts/presets/tracking_track_color/far_plane.py
branches/cycles/release/scripts/presets/tracking_track_color/near_plane.py
branches/cycles/source/blender/editors/space_clip/CMakeLists.txt
branches/cycles/source/blender/editors/space_clip/SConscript
branches/cycles/source/blender/editors/space_clip/clip_buttons.c
branches/cycles/source/blender/editors/space_clip/clip_draw.c
branches/cycles/source/blender/editors/space_clip/clip_editor.c
branches/cycles/source/blender/editors/space_clip/clip_graph_draw.c
branches/cycles/source/blender/editors/space_clip/clip_graph_ops.c
branches/cycles/source/blender/editors/space_clip/clip_intern.h
branches/cycles/source/blender/editors/space_clip/clip_ops.c
branches/cycles/source/blender/editors/space_clip/clip_toolbar.c
branches/cycles/source/blender/editors/space_clip/clip_utils.c
branches/cycles/source/blender/editors/space_clip/space_clip.c
branches/cycles/source/blender/editors/space_clip/tracking_ops.c
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/release/datafiles/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41531
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41613
Added: svn:externals
+
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/CMakeLists.txt 2011-11-07 15:23:08 UTC (rev 41617)
@@ -203,6 +203,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)
Modified: branches/cycles/GNUmakefile
===================================================================
--- branches/cycles/GNUmakefile 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/GNUmakefile 2011-11-07 15:23:08 UTC (rev 41617)
@@ -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"
@@ -151,6 +148,7 @@
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
+ @echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
@echo " * doc_man - generate manpage"
@echo ""
@@ -170,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:
@@ -238,9 +226,13 @@
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
- cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+ cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
+doc_doxy:
+ cd doc/doxygen; doxygen
+ @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
+
doc_dna:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
Modified: branches/cycles/build_files/scons/tools/Blender.py
===================================================================
--- branches/cycles/build_files/scons/tools/Blender.py 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/build_files/scons/tools/Blender.py 2011-11-07 15:23:08 UTC (rev 41617)
@@ -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/cycles/build_files/scons/tools/btools.py
===================================================================
--- branches/cycles/build_files/scons/tools/btools.py 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/build_files/scons/tools/btools.py 2011-11-07 15:23:08 UTC (rev 41617)
@@ -515,6 +515,8 @@
(BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
(BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
+ (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
+
('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
# (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
Modified: branches/cycles/doc/doxygen/Doxyfile
===================================================================
--- branches/cycles/doc/doxygen/Doxyfile 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/doc/doxygen/Doxyfile 2011-11-07 15:23:08 UTC (rev 41617)
@@ -44,7 +44,7 @@
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
-PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png
+PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -193,7 +193,7 @@
# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
-TAB_SIZE = 8
+TAB_SIZE = 4
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
Modified: branches/cycles/doc/doxygen/doxygen.source
===================================================================
--- branches/cycles/doc/doxygen/doxygen.source 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/doc/doxygen/doxygen.source 2011-11-07 15:23:08 UTC (rev 41617)
@@ -22,6 +22,10 @@
* \ingroup python
*/
+/** \defgroup pymathutils Python Mathutils
+ * \ingroup python
+ */
+
/** \defgroup pythonintern Python RNA and Operators
* \ingroup python
*/
Modified: branches/cycles/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/cycles/doc/python_api/sphinx_doc_gen.py 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/doc/python_api/sphinx_doc_gen.py 2011-11-07 15:23:08 UTC (rev 41617)
@@ -150,10 +150,6 @@
return isinstance(value, tuple) and type(tuple) != tuple and hasattr(value, "n_fields")
-def module_id_as_ref(name):
- return "mod_" + name.replace(".", "__")
-
-
def undocumented_message(module_name, type_name, identifier):
if str(type_name).startswith('<module'):
preloadtitle = '%s.%s' % (module_name, identifier)
@@ -391,10 +387,6 @@
write_title(fw, "%s (%s)" % (title, module_name), "=")
- # write reference, annoying since we should be able to direct reference the
- # modules but we cant always!
- fw(".. _%s:\n\n" % module_id_as_ref(module_name))
-
fw(".. module:: %s\n\n" % module_name)
if module.__doc__:
@@ -453,21 +445,20 @@
if type(descr) == MemberDescriptorType:
if descr.__doc__:
value = getattr(module, key, None)
+
value_type = type(value)
descr_sorted.append((key, descr, value, type(value)))
# sort by the valye type
descr_sorted.sort(key=lambda descr_data: str(descr_data[3]))
for key, descr, value, value_type in descr_sorted:
- type_name = value_type.__name__
- py_descr2sphinx("", fw, descr, module_name, type_name, key)
+ # must be documented as a submodule
if is_struct_seq(value):
- # ack, cant use typical reference because we double up once here
- # and one fort he module!
- full_name = "%s.%s" % (module_name, type_name)
- fw(" :ref:`%s submodule details <%s>`\n\n\n" % (full_name, module_id_as_ref(full_name)))
- del full_name
+ continue
+ type_name = value_type.__name__
+ py_descr2sphinx("", fw, descr, module_name, type_name, key)
+
attribute_set.add(key)
del key, descr, descr_sorted
Modified: branches/cycles/extern/CMakeLists.txt
===================================================================
--- branches/cycles/extern/CMakeLists.txt 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/extern/CMakeLists.txt 2011-11-07 15:23:08 UTC (rev 41617)
@@ -63,3 +63,7 @@
if(WITH_LZMA)
add_subdirectory(lzma)
endif()
+
+if(WITH_LIBMV)
+ add_subdirectory(libmv)
+endif()
Modified: branches/cycles/extern/SConscript
===================================================================
--- branches/cycles/extern/SConscript 2011-11-07 15:19:26 UTC (rev 41616)
+++ branches/cycles/extern/SConscript 2011-11-07 15:23:08 UTC (rev 41617)
@@ -28,3 +28,6 @@
if env['WITH_BF_LZMA']:
SConscript(['lzma/SConscript'])
+
+if env['WITH_BF_LIBMV']:
+ SConscript(['libmv/SConscript'])
Deleted: branches/cycles/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt 2011-11-07 14:34:56 UTC (rev 41613)
+++ branches/cycles/extern/libmv/CMakeLists.txt 2011-11-07 15:23:08 UTC (rev 41617)
@@ -1,210 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2011, Blender Foundation
-# All rights reserved.
-#
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list