[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43092] branches/tile: Merging Trunk changes into Tile branch:
Thomas Dinges
blender at dingto.org
Tue Jan 3 05:23:51 CET 2012
Revision: 43092
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43092
Author: dingto
Date: 2012-01-03 04:23:41 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Merging Trunk changes into Tile branch:
SVN Range: 42300-43091.
Resolved issues:
* Re-added compat code for new Compositor in readfile.c
* Matrix multiplication order fixes, see commit 42670.
Tested compile on windows, branch looks good after merge! :)
Modified Paths:
--------------
branches/tile/CMakeLists.txt
branches/tile/SConstruct
branches/tile/build_files/buildbot/config/user-config-i686.py
branches/tile/build_files/buildbot/config/user-config-player-x86_64.py
branches/tile/build_files/buildbot/config/user-config-x86_64.py
branches/tile/build_files/cmake/cmake_qtcreator_project.py
branches/tile/build_files/cmake/macros.cmake
branches/tile/build_files/scons/config/darwin-config.py
branches/tile/build_files/scons/config/linux-config.py
branches/tile/build_files/scons/config/linuxcross-config.py
branches/tile/build_files/scons/config/win32-mingw-config.py
branches/tile/build_files/scons/config/win32-vc-config.py
branches/tile/build_files/scons/config/win64-vc-config.py
branches/tile/build_files/scons/tools/Blender.py
branches/tile/build_files/scons/tools/btools.py
branches/tile/doc/manpage/blender.1
branches/tile/doc/python_api/rst/change_log.rst
branches/tile/doc/python_api/sphinx_doc_gen.py
branches/tile/extern/CMakeLists.txt
branches/tile/extern/eltopo/CMakeLists.txt
branches/tile/extern/eltopo/common/gluvi.h
branches/tile/extern/eltopo/common/predicates.cpp
branches/tile/extern/eltopo/common/tunicate/orientation.cpp
branches/tile/extern/eltopo/common/tunicate/sos_orientation.cpp
branches/tile/extern/eltopo/eltopo3d/dynamicsurface.cpp
branches/tile/extern/eltopo/eltopo3d/surftrack.cpp
branches/tile/extern/libmv/CMakeLists.txt
branches/tile/extern/libmv/SConscript
branches/tile/extern/libmv/bundle.sh
branches/tile/extern/libmv/files.txt
branches/tile/extern/libmv/libmv/numeric/numeric.h
branches/tile/extern/libmv/libmv/tracking/esm_region_tracker.cc
branches/tile/extern/libmv/libmv/tracking/esm_region_tracker.h
branches/tile/extern/libmv/libmv-capi.cpp
branches/tile/extern/libmv/libmv-capi.h
branches/tile/extern/libmv/mkfiles.sh
branches/tile/extern/libmv/third_party/glog/src/config.h
branches/tile/intern/CMakeLists.txt
branches/tile/intern/SConscript
branches/tile/intern/audaspace/intern/AUD_C-API.cpp
branches/tile/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/tile/intern/audaspace/jack/AUD_JackDevice.h
branches/tile/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/tile/intern/cycles/CMakeLists.txt
branches/tile/intern/cycles/SConscript
branches/tile/intern/cycles/app/cycles_test.cpp
branches/tile/intern/cycles/app/cycles_xml.cpp
branches/tile/intern/cycles/blender/CMakeLists.txt
branches/tile/intern/cycles/blender/addon/__init__.py
branches/tile/intern/cycles/blender/addon/engine.py
branches/tile/intern/cycles/blender/addon/enums.py
branches/tile/intern/cycles/blender/addon/properties.py
branches/tile/intern/cycles/blender/addon/ui.py
branches/tile/intern/cycles/blender/blender_camera.cpp
branches/tile/intern/cycles/blender/blender_mesh.cpp
branches/tile/intern/cycles/blender/blender_object.cpp
branches/tile/intern/cycles/blender/blender_python.cpp
branches/tile/intern/cycles/blender/blender_session.cpp
branches/tile/intern/cycles/blender/blender_session.h
branches/tile/intern/cycles/blender/blender_shader.cpp
branches/tile/intern/cycles/blender/blender_sync.cpp
branches/tile/intern/cycles/blender/blender_sync.h
branches/tile/intern/cycles/bvh/bvh_build.cpp
branches/tile/intern/cycles/device/device.cpp
branches/tile/intern/cycles/device/device.h
branches/tile/intern/cycles/device/device_cpu.cpp
branches/tile/intern/cycles/device/device_cuda.cpp
branches/tile/intern/cycles/device/device_multi.cpp
branches/tile/intern/cycles/device/device_opencl.cpp
branches/tile/intern/cycles/kernel/CMakeLists.txt
branches/tile/intern/cycles/kernel/kernel.cl
branches/tile/intern/cycles/kernel/kernel.cpp
branches/tile/intern/cycles/kernel/kernel.cu
branches/tile/intern/cycles/kernel/kernel.h
branches/tile/intern/cycles/kernel/kernel_bvh.h
branches/tile/intern/cycles/kernel/kernel_camera.h
branches/tile/intern/cycles/kernel/kernel_compat_opencl.h
branches/tile/intern/cycles/kernel/kernel_displace.h
branches/tile/intern/cycles/kernel/kernel_film.h
branches/tile/intern/cycles/kernel/kernel_optimized.cpp
branches/tile/intern/cycles/kernel/kernel_path.h
branches/tile/intern/cycles/kernel/kernel_random.h
branches/tile/intern/cycles/kernel/kernel_types.h
branches/tile/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/tile/intern/cycles/kernel/osl/nodes/node_color.h
branches/tile/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/tile/intern/cycles/kernel/svm/svm.h
branches/tile/intern/cycles/kernel/svm/svm_mix.h
branches/tile/intern/cycles/kernel/svm/svm_types.h
branches/tile/intern/cycles/render/buffers.cpp
branches/tile/intern/cycles/render/buffers.h
branches/tile/intern/cycles/render/camera.cpp
branches/tile/intern/cycles/render/graph.cpp
branches/tile/intern/cycles/render/graph.h
branches/tile/intern/cycles/render/integrator.cpp
branches/tile/intern/cycles/render/integrator.h
branches/tile/intern/cycles/render/mesh.cpp
branches/tile/intern/cycles/render/mesh_displace.cpp
branches/tile/intern/cycles/render/nodes.cpp
branches/tile/intern/cycles/render/nodes.h
branches/tile/intern/cycles/render/session.cpp
branches/tile/intern/cycles/render/session.h
branches/tile/intern/cycles/render/sobol.cpp
branches/tile/intern/cycles/render/sobol.h
branches/tile/intern/cycles/render/tile.cpp
branches/tile/intern/cycles/render/tile.h
branches/tile/intern/cycles/subd/subd_mesh.cpp
branches/tile/intern/cycles/util/util_boundbox.h
branches/tile/intern/cycles/util/util_cache.h
branches/tile/intern/cycles/util/util_math.h
branches/tile/intern/cycles/util/util_md5.cpp
branches/tile/intern/cycles/util/util_system.cpp
branches/tile/intern/cycles/util/util_transform.h
branches/tile/intern/ghost/CMakeLists.txt
branches/tile/intern/ghost/GHOST_C-api.h
branches/tile/intern/ghost/GHOST_ISystem.h
branches/tile/intern/ghost/GHOST_IWindow.h
branches/tile/intern/ghost/intern/GHOST_C-api.cpp
branches/tile/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/tile/intern/ghost/intern/GHOST_Debug.h
branches/tile/intern/ghost/intern/GHOST_DisplayManager.h
branches/tile/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/tile/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/tile/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/tile/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/tile/intern/ghost/intern/GHOST_EventKey.h
branches/tile/intern/ghost/intern/GHOST_EventNDOF.h
branches/tile/intern/ghost/intern/GHOST_EventTrackpad.h
branches/tile/intern/ghost/intern/GHOST_System.cpp
branches/tile/intern/ghost/intern/GHOST_System.h
branches/tile/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/tile/intern/ghost/intern/GHOST_SystemCocoa.h
branches/tile/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/tile/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/tile/intern/ghost/intern/GHOST_SystemX11.cpp
branches/tile/intern/ghost/intern/GHOST_TimerTask.h
branches/tile/intern/ghost/intern/GHOST_Window.cpp
branches/tile/intern/ghost/intern/GHOST_Window.h
branches/tile/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/tile/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/tile/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/tile/intern/ghost/intern/GHOST_WindowWin32.h
branches/tile/intern/ghost/intern/GHOST_WindowX11.cpp
branches/tile/intern/guardedalloc/MEM_sys_types.h
branches/tile/intern/iksolver/intern/IK_Solver.cpp
branches/tile/intern/mikktspace/mikktspace.c
branches/tile/intern/opennl/intern/opennl.c
branches/tile/intern/opennl/superlu/get_perm_c.c
branches/tile/intern/opennl/superlu/scolumn_bmod.c
branches/tile/intern/opennl/superlu/strsv.c
branches/tile/intern/opennl/superlu/sutil.c
branches/tile/intern/opennl/superlu/util.h
branches/tile/intern/smoke/intern/smoke_API.cpp
branches/tile/intern/tools/dump_rna2xml.py
branches/tile/release/datafiles/blender_icons.png
branches/tile/release/datafiles/splash.png
branches/tile/release/plugins/sequence/color-correction-hsv.c
branches/tile/release/plugins/sequence/color-correction-yuv.c
branches/tile/release/plugins/sequence/dnr.c
branches/tile/release/plugins/sequence/gamma.c
branches/tile/release/scripts/modules/animsys_refactor.py
branches/tile/release/scripts/modules/bpy/path.py
branches/tile/release/scripts/modules/bpy/utils.py
branches/tile/release/scripts/modules/bpy_extras/image_utils.py
branches/tile/release/scripts/modules/bpy_extras/io_utils.py
branches/tile/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/tile/release/scripts/modules/bpy_extras/view3d_utils.py
branches/tile/release/scripts/modules/rna_prop_ui.py
branches/tile/release/scripts/modules/sys_info.py
branches/tile/release/scripts/presets/ffmpeg/DV.py
branches/tile/release/scripts/presets/ffmpeg/DVD.py
branches/tile/release/scripts/presets/ffmpeg/SVCD.py
branches/tile/release/scripts/presets/ffmpeg/VCD.py
branches/tile/release/scripts/presets/tracking_settings/default.py
branches/tile/release/scripts/presets/tracking_settings/fast_motion.py
branches/tile/release/scripts/startup/bl_operators/anim.py
branches/tile/release/scripts/startup/bl_operators/clip.py
branches/tile/release/scripts/startup/bl_operators/image.py
branches/tile/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/tile/release/scripts/startup/bl_operators/presets.py
branches/tile/release/scripts/startup/bl_operators/sequencer.py
branches/tile/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/tile/release/scripts/startup/bl_operators/wm.py
branches/tile/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/tile/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/tile/release/scripts/startup/bl_ui/properties_game.py
branches/tile/release/scripts/startup/bl_ui/properties_object.py
branches/tile/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/tile/release/scripts/startup/bl_ui/properties_particle.py
branches/tile/release/scripts/startup/bl_ui/properties_render.py
branches/tile/release/scripts/startup/bl_ui/properties_scene.py
branches/tile/release/scripts/startup/bl_ui/properties_texture.py
branches/tile/release/scripts/startup/bl_ui/space_clip.py
branches/tile/release/scripts/startup/bl_ui/space_image.py
branches/tile/release/scripts/startup/bl_ui/space_logic.py
branches/tile/release/scripts/startup/bl_ui/space_node.py
branches/tile/release/scripts/startup/bl_ui/space_text.py
branches/tile/release/scripts/startup/bl_ui/space_userpref.py
branches/tile/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/tile/release/scripts/startup/bl_ui/space_view3d.py
branches/tile/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/tile/release/scripts/startup/keyingsets_builtins.py
branches/tile/source/blender/CMakeLists.txt
branches/tile/source/blender/avi/intern/avi.c
branches/tile/source/blender/avi/intern/codecs.c
branches/tile/source/blender/avi/intern/endian.c
branches/tile/source/blender/avi/intern/mjpeg.c
branches/tile/source/blender/avi/intern/options.c
branches/tile/source/blender/avi/intern/rgb32.c
branches/tile/source/blender/blenfont/BLF_translation.h
branches/tile/source/blender/blenfont/intern/blf_lang.c
branches/tile/source/blender/blenfont/intern/blf_translation.c
branches/tile/source/blender/blenkernel/BKE_DerivedMesh.h
branches/tile/source/blender/blenkernel/BKE_array_mallocn.h
branches/tile/source/blender/blenkernel/BKE_blender.h
branches/tile/source/blender/blenkernel/BKE_colortools.h
branches/tile/source/blender/blenkernel/BKE_customdata.h
branches/tile/source/blender/blenkernel/BKE_deform.h
branches/tile/source/blender/blenkernel/BKE_effect.h
branches/tile/source/blender/blenkernel/BKE_global.h
branches/tile/source/blender/blenkernel/BKE_group.h
branches/tile/source/blender/blenkernel/BKE_mesh.h
branches/tile/source/blender/blenkernel/BKE_modifier.h
branches/tile/source/blender/blenkernel/BKE_movieclip.h
branches/tile/source/blender/blenkernel/BKE_node.h
branches/tile/source/blender/blenkernel/BKE_object.h
branches/tile/source/blender/blenkernel/BKE_particle.h
branches/tile/source/blender/blenkernel/BKE_texture.h
branches/tile/source/blender/blenkernel/BKE_tracking.h
branches/tile/source/blender/blenkernel/BKE_utildefines.h
branches/tile/source/blender/blenkernel/BKE_writeffmpeg.h
branches/tile/source/blender/blenkernel/CMakeLists.txt
branches/tile/source/blender/blenkernel/depsgraph_private.h
branches/tile/source/blender/blenkernel/intern/CCGSubSurf.c
branches/tile/source/blender/blenkernel/intern/CCGSubSurf.h
branches/tile/source/blender/blenkernel/intern/DerivedMesh.c
branches/tile/source/blender/blenkernel/intern/anim.c
branches/tile/source/blender/blenkernel/intern/armature.c
branches/tile/source/blender/blenkernel/intern/boids.c
branches/tile/source/blender/blenkernel/intern/brush.c
branches/tile/source/blender/blenkernel/intern/bvhutils.c
branches/tile/source/blender/blenkernel/intern/camera.c
branches/tile/source/blender/blenkernel/intern/cdderivedmesh.c
branches/tile/source/blender/blenkernel/intern/colortools.c
branches/tile/source/blender/blenkernel/intern/constraint.c
branches/tile/source/blender/blenkernel/intern/customdata.c
branches/tile/source/blender/blenkernel/intern/deform.c
branches/tile/source/blender/blenkernel/intern/depsgraph.c
branches/tile/source/blender/blenkernel/intern/dynamicpaint.c
branches/tile/source/blender/blenkernel/intern/effect.c
branches/tile/source/blender/blenkernel/intern/fcurve.c
branches/tile/source/blender/blenkernel/intern/group.c
branches/tile/source/blender/blenkernel/intern/idprop.c
branches/tile/source/blender/blenkernel/intern/image.c
branches/tile/source/blender/blenkernel/intern/image_gen.c
branches/tile/source/blender/blenkernel/intern/ipo.c
branches/tile/source/blender/blenkernel/intern/lattice.c
branches/tile/source/blender/blenkernel/intern/library.c
branches/tile/source/blender/blenkernel/intern/material.c
branches/tile/source/blender/blenkernel/intern/mball.c
branches/tile/source/blender/blenkernel/intern/mesh.c
branches/tile/source/blender/blenkernel/intern/mesh_validate.c
branches/tile/source/blender/blenkernel/intern/modifier.c
branches/tile/source/blender/blenkernel/intern/movieclip.c
branches/tile/source/blender/blenkernel/intern/multires.c
branches/tile/source/blender/blenkernel/intern/node.c
branches/tile/source/blender/blenkernel/intern/object.c
branches/tile/source/blender/blenkernel/intern/ocean.c
branches/tile/source/blender/blenkernel/intern/paint.c
branches/tile/source/blender/blenkernel/intern/particle.c
branches/tile/source/blender/blenkernel/intern/particle_system.c
branches/tile/source/blender/blenkernel/intern/pointcache.c
branches/tile/source/blender/blenkernel/intern/scene.c
branches/tile/source/blender/blenkernel/intern/seqeffects.c
branches/tile/source/blender/blenkernel/intern/sequencer.c
branches/tile/source/blender/blenkernel/intern/subsurf_ccg.c
branches/tile/source/blender/blenkernel/intern/suggestions.c
branches/tile/source/blender/blenkernel/intern/text.c
branches/tile/source/blender/blenkernel/intern/texture.c
branches/tile/source/blender/blenkernel/intern/tracking.c
branches/tile/source/blender/blenkernel/intern/unit.c
branches/tile/source/blender/blenkernel/intern/writeavi.c
branches/tile/source/blender/blenkernel/intern/writeffmpeg.c
branches/tile/source/blender/blenlib/BLI_dynstr.h
branches/tile/source/blender/blenlib/BLI_edgehash.h
branches/tile/source/blender/blenlib/BLI_fileops.h
branches/tile/source/blender/blenlib/BLI_ghash.h
branches/tile/source/blender/blenlib/BLI_math_base.h
branches/tile/source/blender/blenlib/BLI_math_color.h
branches/tile/source/blender/blenlib/BLI_math_geom.h
branches/tile/source/blender/blenlib/BLI_math_matrix.h
branches/tile/source/blender/blenlib/BLI_math_vector.h
branches/tile/source/blender/blenlib/BLI_utildefines.h
branches/tile/source/blender/blenlib/CMakeLists.txt
branches/tile/source/blender/blenlib/intern/BLI_dynstr.c
branches/tile/source/blender/blenlib/intern/BLI_ghash.c
branches/tile/source/blender/blenlib/intern/BLI_linklist.c
branches/tile/source/blender/blenlib/intern/BLI_memarena.c
branches/tile/source/blender/blenlib/intern/BLI_mempool.c
branches/tile/source/blender/blenlib/intern/bpath.c
branches/tile/source/blender/blenlib/intern/edgehash.c
branches/tile/source/blender/blenlib/intern/math_base_inline.c
branches/tile/source/blender/blenlib/intern/math_color.c
branches/tile/source/blender/blenlib/intern/math_geom.c
branches/tile/source/blender/blenlib/intern/math_matrix.c
branches/tile/source/blender/blenlib/intern/math_rotation.c
branches/tile/source/blender/blenlib/intern/math_vector.c
branches/tile/source/blender/blenlib/intern/path_util.c
branches/tile/source/blender/blenlib/intern/rand.c
branches/tile/source/blender/blenlib/intern/scanfill.c
branches/tile/source/blender/blenlib/intern/storage.c
branches/tile/source/blender/blenlib/intern/winstuff.c
branches/tile/source/blender/blenloader/BLO_sys_types.h
branches/tile/source/blender/blenloader/CMakeLists.txt
branches/tile/source/blender/blenloader/SConscript
branches/tile/source/blender/blenloader/intern/readfile.c
branches/tile/source/blender/blenloader/intern/writefile.c
branches/tile/source/blender/collada/AnimationExporter.cpp
branches/tile/source/blender/collada/AnimationImporter.cpp
branches/tile/source/blender/collada/ArmatureExporter.cpp
branches/tile/source/blender/collada/ArmatureImporter.cpp
branches/tile/source/blender/collada/DocumentImporter.cpp
branches/tile/source/blender/collada/MeshImporter.cpp
branches/tile/source/blender/collada/TransformReader.cpp
branches/tile/source/blender/collada/TransformWriter.cpp
branches/tile/source/blender/collada/collada_utils.cpp
branches/tile/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/tile/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/tile/source/blender/editors/animation/anim_channels_edit.c
branches/tile/source/blender/editors/animation/anim_filter.c
branches/tile/source/blender/editors/animation/anim_ipo_utils.c
branches/tile/source/blender/editors/animation/keyframing.c
branches/tile/source/blender/editors/animation/keyingsets.c
branches/tile/source/blender/editors/armature/editarmature.c
branches/tile/source/blender/editors/armature/meshlaplacian.c
branches/tile/source/blender/editors/armature/poselib.c
branches/tile/source/blender/editors/armature/poseobject.c
branches/tile/source/blender/editors/curve/curve_intern.h
branches/tile/source/blender/editors/curve/curve_ops.c
branches/tile/source/blender/editors/curve/editcurve.c
branches/tile/source/blender/editors/curve/editfont.c
branches/tile/source/blender/editors/datafiles/blender_icons.png.c
branches/tile/source/blender/editors/datafiles/splash.png.c
branches/tile/source/blender/editors/gpencil/drawgpencil.c
branches/tile/source/blender/editors/gpencil/gpencil_buttons.c
branches/tile/source/blender/editors/include/BIF_glutil.h
branches/tile/source/blender/editors/include/ED_curve.h
branches/tile/source/blender/editors/include/ED_mesh.h
branches/tile/source/blender/editors/include/ED_object.h
branches/tile/source/blender/editors/include/ED_view3d.h
branches/tile/source/blender/editors/include/UI_icons.h
branches/tile/source/blender/editors/interface/interface.c
branches/tile/source/blender/editors/interface/interface_draw.c
branches/tile/source/blender/editors/interface/interface_handlers.c
branches/tile/source/blender/editors/interface/interface_intern.h
branches/tile/source/blender/editors/interface/interface_ops.c
branches/tile/source/blender/editors/interface/interface_panel.c
branches/tile/source/blender/editors/interface/interface_regions.c
branches/tile/source/blender/editors/interface/interface_templates.c
branches/tile/source/blender/editors/interface/interface_widgets.c
branches/tile/source/blender/editors/interface/resources.c
branches/tile/source/blender/editors/interface/view2d.c
branches/tile/source/blender/editors/mesh/editface.c
branches/tile/source/blender/editors/mesh/editmesh.c
branches/tile/source/blender/editors/mesh/editmesh_lib.c
branches/tile/source/blender/editors/mesh/editmesh_mods.c
branches/tile/source/blender/editors/mesh/editmesh_tools.c
branches/tile/source/blender/editors/mesh/mesh_data.c
branches/tile/source/blender/editors/mesh/mesh_navmesh.c
branches/tile/source/blender/editors/mesh/meshtools.c
branches/tile/source/blender/editors/metaball/mball_edit.c
branches/tile/source/blender/editors/object/object_add.c
branches/tile/source/blender/editors/object/object_bake.c
branches/tile/source/blender/editors/object/object_constraint.c
branches/tile/source/blender/editors/object/object_edit.c
branches/tile/source/blender/editors/object/object_group.c
branches/tile/source/blender/editors/object/object_hook.c
branches/tile/source/blender/editors/object/object_intern.h
branches/tile/source/blender/editors/object/object_modifier.c
branches/tile/source/blender/editors/object/object_ops.c
branches/tile/source/blender/editors/object/object_relations.c
branches/tile/source/blender/editors/object/object_select.c
branches/tile/source/blender/editors/object/object_shapekey.c
branches/tile/source/blender/editors/object/object_transform.c
branches/tile/source/blender/editors/object/object_vgroup.c
branches/tile/source/blender/editors/physics/dynamicpaint_ops.c
branches/tile/source/blender/editors/physics/particle_object.c
branches/tile/source/blender/editors/physics/physics_fluid.c
branches/tile/source/blender/editors/physics/physics_pointcache.c
branches/tile/source/blender/editors/render/render_internal.c
branches/tile/source/blender/editors/render/render_opengl.c
branches/tile/source/blender/editors/render/render_preview.c
branches/tile/source/blender/editors/render/render_shading.c
branches/tile/source/blender/editors/screen/glutil.c
branches/tile/source/blender/editors/screen/screen_ops.c
branches/tile/source/blender/editors/screen/screendump.c
branches/tile/source/blender/editors/sculpt_paint/paint_image.c
branches/tile/source/blender/editors/sculpt_paint/paint_intern.h
branches/tile/source/blender/editors/sculpt_paint/paint_ops.c
branches/tile/source/blender/editors/sculpt_paint/paint_stroke.c
branches/tile/source/blender/editors/sculpt_paint/paint_utils.c
branches/tile/source/blender/editors/sculpt_paint/paint_vertex.c
branches/tile/source/blender/editors/sculpt_paint/sculpt.c
branches/tile/source/blender/editors/sound/sound_ops.c
branches/tile/source/blender/editors/space_action/action_select.c
branches/tile/source/blender/editors/space_api/spacetypes.c
branches/tile/source/blender/editors/space_buttons/buttons_texture.c
branches/tile/source/blender/editors/space_clip/clip_draw.c
branches/tile/source/blender/editors/space_clip/clip_editor.c
branches/tile/source/blender/editors/space_clip/clip_graph_draw.c
branches/tile/source/blender/editors/space_clip/clip_graph_ops.c
branches/tile/source/blender/editors/space_clip/clip_intern.h
branches/tile/source/blender/editors/space_clip/clip_ops.c
branches/tile/source/blender/editors/space_clip/clip_toolbar.c
branches/tile/source/blender/editors/space_clip/clip_utils.c
branches/tile/source/blender/editors/space_clip/space_clip.c
branches/tile/source/blender/editors/space_clip/tracking_ops.c
branches/tile/source/blender/editors/space_file/file_ops.c
branches/tile/source/blender/editors/space_file/filesel.c
branches/tile/source/blender/editors/space_graph/graph_select.c
branches/tile/source/blender/editors/space_image/image_buttons.c
branches/tile/source/blender/editors/space_node/node_buttons.c
branches/tile/source/blender/editors/space_node/node_draw.c
branches/tile/source/blender/editors/space_node/node_edit.c
branches/tile/source/blender/editors/space_node/node_intern.h
branches/tile/source/blender/editors/space_node/node_ops.c
branches/tile/source/blender/editors/space_node/node_select.c
branches/tile/source/blender/editors/space_node/node_state.c
branches/tile/source/blender/editors/space_node/node_templates.c
branches/tile/source/blender/editors/space_node/space_node.c
branches/tile/source/blender/editors/space_outliner/outliner_draw.c
branches/tile/source/blender/editors/space_outliner/outliner_edit.c
branches/tile/source/blender/editors/space_outliner/outliner_select.c
branches/tile/source/blender/editors/space_outliner/outliner_tree.c
branches/tile/source/blender/editors/space_sequencer/space_sequencer.c
branches/tile/source/blender/editors/space_text/text_ops.c
branches/tile/source/blender/editors/space_time/space_time.c
branches/tile/source/blender/editors/space_view3d/drawanimviz.c
branches/tile/source/blender/editors/space_view3d/drawmesh.c
branches/tile/source/blender/editors/space_view3d/drawobject.c
branches/tile/source/blender/editors/space_view3d/drawvolume.c
branches/tile/source/blender/editors/space_view3d/space_view3d.c
branches/tile/source/blender/editors/space_view3d/view3d_buttons.c
branches/tile/source/blender/editors/space_view3d/view3d_draw.c
branches/tile/source/blender/editors/space_view3d/view3d_edit.c
branches/tile/source/blender/editors/space_view3d/view3d_fly.c
branches/tile/source/blender/editors/space_view3d/view3d_header.c
branches/tile/source/blender/editors/space_view3d/view3d_select.c
branches/tile/source/blender/editors/space_view3d/view3d_snap.c
branches/tile/source/blender/editors/space_view3d/view3d_toolbar.c
branches/tile/source/blender/editors/space_view3d/view3d_view.c
branches/tile/source/blender/editors/transform/transform.c
branches/tile/source/blender/editors/transform/transform.h
branches/tile/source/blender/editors/transform/transform_constraints.c
branches/tile/source/blender/editors/transform/transform_conversions.c
branches/tile/source/blender/editors/transform/transform_generics.c
branches/tile/source/blender/editors/transform/transform_input.c
branches/tile/source/blender/editors/transform/transform_manipulator.c
branches/tile/source/blender/editors/transform/transform_ops.c
branches/tile/source/blender/editors/transform/transform_orientations.c
branches/tile/source/blender/editors/transform/transform_snap.c
branches/tile/source/blender/editors/util/undo.c
branches/tile/source/blender/editors/uvedit/uvedit_ops.c
branches/tile/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/tile/source/blender/gpu/GPU_buffers.h
branches/tile/source/blender/gpu/GPU_draw.h
branches/tile/source/blender/gpu/GPU_extensions.h
branches/tile/source/blender/gpu/GPU_material.h
branches/tile/source/blender/gpu/intern/gpu_buffers.c
branches/tile/source/blender/gpu/intern/gpu_codegen.c
branches/tile/source/blender/gpu/intern/gpu_codegen.h
branches/tile/source/blender/gpu/intern/gpu_draw.c
branches/tile/source/blender/gpu/intern/gpu_extensions.c
branches/tile/source/blender/gpu/intern/gpu_material.c
branches/tile/source/blender/gpu/intern/gpu_shader_material.glsl
branches/tile/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/tile/source/blender/ikplugin/intern/iksolver_plugin.c
branches/tile/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/tile/source/blender/imbuf/CMakeLists.txt
branches/tile/source/blender/imbuf/IMB_imbuf.h
branches/tile/source/blender/imbuf/IMB_imbuf_types.h
branches/tile/source/blender/imbuf/intern/allocimbuf.c
branches/tile/source/blender/imbuf/intern/anim_movie.c
branches/tile/source/blender/imbuf/intern/bmp.c
branches/tile/source/blender/imbuf/intern/divers.c
branches/tile/source/blender/imbuf/intern/indexer.c
branches/tile/source/blender/imbuf/intern/jp2.c
branches/tile/source/blender/imbuf/intern/thumbs.c
branches/tile/source/blender/imbuf/intern/util.c
branches/tile/source/blender/makesdna/DNA_ID.h
branches/tile/source/blender/makesdna/DNA_action_types.h
branches/tile/source/blender/makesdna/DNA_actuator_types.h
branches/tile/source/blender/makesdna/DNA_anim_types.h
branches/tile/source/blender/makesdna/DNA_armature_types.h
branches/tile/source/blender/makesdna/DNA_boid_types.h
branches/tile/source/blender/makesdna/DNA_brush_types.h
branches/tile/source/blender/makesdna/DNA_camera_types.h
branches/tile/source/blender/makesdna/DNA_cloth_types.h
branches/tile/source/blender/makesdna/DNA_color_types.h
branches/tile/source/blender/makesdna/DNA_constraint_types.h
branches/tile/source/blender/makesdna/DNA_controller_types.h
branches/tile/source/blender/makesdna/DNA_curve_types.h
branches/tile/source/blender/makesdna/DNA_customdata_types.h
branches/tile/source/blender/makesdna/DNA_documentation.h
branches/tile/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/tile/source/blender/makesdna/DNA_effect_types.h
branches/tile/source/blender/makesdna/DNA_fileglobal_types.h
branches/tile/source/blender/makesdna/DNA_genfile.h
branches/tile/source/blender/makesdna/DNA_gpencil_types.h
branches/tile/source/blender/makesdna/DNA_group_types.h
branches/tile/source/blender/makesdna/DNA_image_types.h
branches/tile/source/blender/makesdna/DNA_key_types.h
branches/tile/source/blender/makesdna/DNA_lamp_types.h
branches/tile/source/blender/makesdna/DNA_lattice_types.h
branches/tile/source/blender/makesdna/DNA_listBase.h
branches/tile/source/blender/makesdna/DNA_material_types.h
branches/tile/source/blender/makesdna/DNA_mesh_types.h
branches/tile/source/blender/makesdna/DNA_meshdata_types.h
branches/tile/source/blender/makesdna/DNA_meta_types.h
branches/tile/source/blender/makesdna/DNA_modifier_types.h
branches/tile/source/blender/makesdna/DNA_movieclip_types.h
branches/tile/source/blender/makesdna/DNA_nla_types.h
branches/tile/source/blender/makesdna/DNA_node_types.h
branches/tile/source/blender/makesdna/DNA_object_fluidsim.h
branches/tile/source/blender/makesdna/DNA_object_force.h
branches/tile/source/blender/makesdna/DNA_object_types.h
branches/tile/source/blender/makesdna/DNA_outliner_types.h
branches/tile/source/blender/makesdna/DNA_packedFile_types.h
branches/tile/source/blender/makesdna/DNA_particle_types.h
branches/tile/source/blender/makesdna/DNA_property_types.h
branches/tile/source/blender/makesdna/DNA_scene_types.h
branches/tile/source/blender/makesdna/DNA_screen_types.h
branches/tile/source/blender/makesdna/DNA_sdna_types.h
branches/tile/source/blender/makesdna/DNA_sensor_types.h
branches/tile/source/blender/makesdna/DNA_sequence_types.h
branches/tile/source/blender/makesdna/DNA_smoke_types.h
branches/tile/source/blender/makesdna/DNA_sound_types.h
branches/tile/source/blender/makesdna/DNA_space_types.h
branches/tile/source/blender/makesdna/DNA_speaker_types.h
branches/tile/source/blender/makesdna/DNA_text_types.h
branches/tile/source/blender/makesdna/DNA_texture_types.h
branches/tile/source/blender/makesdna/DNA_tracking_types.h
branches/tile/source/blender/makesdna/DNA_userdef_types.h
branches/tile/source/blender/makesdna/DNA_vec_types.h
branches/tile/source/blender/makesdna/DNA_vfont_types.h
branches/tile/source/blender/makesdna/DNA_view2d_types.h
branches/tile/source/blender/makesdna/DNA_view3d_types.h
branches/tile/source/blender/makesdna/DNA_windowmanager_types.h
branches/tile/source/blender/makesdna/DNA_world_types.h
branches/tile/source/blender/makesdna/intern/dna_genfile.c
branches/tile/source/blender/makesdna/intern/makesdna.c
branches/tile/source/blender/makesrna/RNA_access.h
branches/tile/source/blender/makesrna/RNA_define.h
branches/tile/source/blender/makesrna/intern/makesrna.c
branches/tile/source/blender/makesrna/intern/rna_access.c
branches/tile/source/blender/makesrna/intern/rna_actuator.c
branches/tile/source/blender/makesrna/intern/rna_brush.c
branches/tile/source/blender/makesrna/intern/rna_constraint.c
branches/tile/source/blender/makesrna/intern/rna_curve.c
branches/tile/source/blender/makesrna/intern/rna_define.c
branches/tile/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/tile/source/blender/makesrna/intern/rna_fcurve.c
branches/tile/source/blender/makesrna/intern/rna_image.c
branches/tile/source/blender/makesrna/intern/rna_internal_types.h
branches/tile/source/blender/makesrna/intern/rna_lamp.c
branches/tile/source/blender/makesrna/intern/rna_main_api.c
branches/tile/source/blender/makesrna/intern/rna_material.c
branches/tile/source/blender/makesrna/intern/rna_mesh.c
branches/tile/source/blender/makesrna/intern/rna_modifier.c
branches/tile/source/blender/makesrna/intern/rna_movieclip.c
branches/tile/source/blender/makesrna/intern/rna_nodetree.c
branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h
branches/tile/source/blender/makesrna/intern/rna_object.c
branches/tile/source/blender/makesrna/intern/rna_object_api.c
branches/tile/source/blender/makesrna/intern/rna_particle.c
branches/tile/source/blender/makesrna/intern/rna_rna.c
branches/tile/source/blender/makesrna/intern/rna_scene.c
branches/tile/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/tile/source/blender/makesrna/intern/rna_sensor.c
branches/tile/source/blender/makesrna/intern/rna_sequencer.c
branches/tile/source/blender/makesrna/intern/rna_space.c
branches/tile/source/blender/makesrna/intern/rna_tracking.c
branches/tile/source/blender/makesrna/intern/rna_userdef.c
branches/tile/source/blender/makesrna/intern/rna_world.c
branches/tile/source/blender/modifiers/CMakeLists.txt
branches/tile/source/blender/modifiers/MOD_modifiertypes.h
branches/tile/source/blender/modifiers/SConscript
branches/tile/source/blender/modifiers/intern/MOD_array.c
branches/tile/source/blender/modifiers/intern/MOD_boolean_util.c
branches/tile/source/blender/modifiers/intern/MOD_cast.c
branches/tile/source/blender/modifiers/intern/MOD_decimate.c
branches/tile/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/tile/source/blender/modifiers/intern/MOD_edgesplit.c
branches/tile/source/blender/modifiers/intern/MOD_explode.c
branches/tile/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/tile/source/blender/modifiers/intern/MOD_hook.c
branches/tile/source/blender/modifiers/intern/MOD_mask.c
branches/tile/source/blender/modifiers/intern/MOD_meshdeform.c
branches/tile/source/blender/modifiers/intern/MOD_mirror.c
branches/tile/source/blender/modifiers/intern/MOD_multires.c
branches/tile/source/blender/modifiers/intern/MOD_screw.c
branches/tile/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/tile/source/blender/modifiers/intern/MOD_smooth.c
branches/tile/source/blender/modifiers/intern/MOD_solidify.c
branches/tile/source/blender/modifiers/intern/MOD_util.c
branches/tile/source/blender/modifiers/intern/MOD_uvproject.c
branches/tile/source/blender/modifiers/intern/MOD_warp.c
branches/tile/source/blender/modifiers/intern/MOD_wave.c
branches/tile/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/tile/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/tile/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/tile/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/tile/source/blender/nodes/CMakeLists.txt
branches/tile/source/blender/nodes/NOD_shader.h
branches/tile/source/blender/nodes/composite/node_composite_util.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_image.c
branches/tile/source/blender/nodes/shader/node_shader_util.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/tile/source/blender/python/SConscript
branches/tile/source/blender/python/generic/bgl.c
branches/tile/source/blender/python/generic/bpy_internal_import.c
branches/tile/source/blender/python/generic/idprop_py_api.c
branches/tile/source/blender/python/generic/py_capi_utils.c
branches/tile/source/blender/python/intern/CMakeLists.txt
branches/tile/source/blender/python/intern/bpy.c
branches/tile/source/blender/python/intern/bpy_app.c
branches/tile/source/blender/python/intern/bpy_app_handlers.c
branches/tile/source/blender/python/intern/bpy_driver.c
branches/tile/source/blender/python/intern/bpy_interface.c
branches/tile/source/blender/python/intern/bpy_interface_atexit.c
branches/tile/source/blender/python/intern/bpy_intern_string.c
branches/tile/source/blender/python/intern/bpy_library.c
branches/tile/source/blender/python/intern/bpy_operator.c
branches/tile/source/blender/python/intern/bpy_operator_wrap.c
branches/tile/source/blender/python/intern/bpy_props.c
branches/tile/source/blender/python/intern/bpy_rna.c
branches/tile/source/blender/python/intern/bpy_rna_anim.c
branches/tile/source/blender/python/intern/bpy_rna_array.c
branches/tile/source/blender/python/intern/bpy_rna_callback.c
branches/tile/source/blender/python/intern/bpy_traceback.c
branches/tile/source/blender/python/intern/bpy_util.c
branches/tile/source/blender/python/intern/gpu.c
branches/tile/source/blender/python/mathutils/mathutils.c
branches/tile/source/blender/python/mathutils/mathutils.h
branches/tile/source/blender/python/mathutils/mathutils_Color.c
branches/tile/source/blender/python/mathutils/mathutils_Euler.c
branches/tile/source/blender/python/mathutils/mathutils_Euler.h
branches/tile/source/blender/python/mathutils/mathutils_Matrix.c
branches/tile/source/blender/python/mathutils/mathutils_Matrix.h
branches/tile/source/blender/python/mathutils/mathutils_Quaternion.c
branches/tile/source/blender/python/mathutils/mathutils_Vector.c
branches/tile/source/blender/python/mathutils/mathutils_Vector.h
branches/tile/source/blender/python/mathutils/mathutils_geometry.c
branches/tile/source/blender/python/mathutils/mathutils_noise.c
branches/tile/source/blender/quicktime/apple/qtkit_export.m
branches/tile/source/blender/quicktime/apple/qtkit_import.m
branches/tile/source/blender/quicktime/apple/quicktime_export.c
branches/tile/source/blender/quicktime/apple/quicktime_import.c
branches/tile/source/blender/quicktime/quicktime_export.h
branches/tile/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/tile/source/blender/render/intern/source/convertblender.c
branches/tile/source/blender/render/intern/source/envmap.c
branches/tile/source/blender/render/intern/source/external_engine.c
branches/tile/source/blender/render/intern/source/imagetexture.c
branches/tile/source/blender/render/intern/source/pipeline.c
branches/tile/source/blender/render/intern/source/pixelshading.c
branches/tile/source/blender/render/intern/source/pointdensity.c
branches/tile/source/blender/render/intern/source/rayshade.c
branches/tile/source/blender/render/intern/source/render_texture.c
branches/tile/source/blender/render/intern/source/renderdatabase.c
branches/tile/source/blender/render/intern/source/shadbuf.c
branches/tile/source/blender/render/intern/source/shadeinput.c
branches/tile/source/blender/render/intern/source/shadeoutput.c
branches/tile/source/blender/render/intern/source/strand.c
branches/tile/source/blender/render/intern/source/volumetric.c
branches/tile/source/blender/render/intern/source/zbuf.c
branches/tile/source/blender/windowmanager/WM_api.h
branches/tile/source/blender/windowmanager/intern/wm_draw.c
branches/tile/source/blender/windowmanager/intern/wm_event_system.c
branches/tile/source/blender/windowmanager/intern/wm_gesture.c
branches/tile/source/blender/windowmanager/intern/wm_operators.c
branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/tile/source/creator/CMakeLists.txt
branches/tile/source/creator/creator.c
branches/tile/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/tile/source/gameengine/Converter/BL_ActionActuator.cpp
branches/tile/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/tile/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/tile/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/tile/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/tile/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/tile/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/tile/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/tile/source/gameengine/Converter/KX_IpoConvert.cpp
branches/tile/source/gameengine/Expressions/InputParser.cpp
branches/tile/source/gameengine/Expressions/Operator1Expr.cpp
branches/tile/source/gameengine/Expressions/Operator2Expr.cpp
branches/tile/source/gameengine/Expressions/PyObjectPlus.h
branches/tile/source/gameengine/Expressions/StringValue.h
branches/tile/source/gameengine/Expressions/Value.cpp
branches/tile/source/gameengine/Expressions/Value.h
branches/tile/source/gameengine/GameLogic/CMakeLists.txt
branches/tile/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/tile/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/tile/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/tile/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/tile/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/tile/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/tile/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/tile/source/gameengine/Ketsji/BL_Material.cpp
branches/tile/source/gameengine/Ketsji/BL_Texture.cpp
branches/tile/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/tile/source/gameengine/Ketsji/KX_Dome.cpp
branches/tile/source/gameengine/Ketsji/KX_FontObject.cpp
branches/tile/source/gameengine/Ketsji/KX_FontObject.h
branches/tile/source/gameengine/Ketsji/KX_GameObject.h
branches/tile/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/tile/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/tile/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/tile/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/tile/source/gameengine/Ketsji/KX_PyMath.h
branches/tile/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/tile/source/gameengine/Ketsji/KX_Scene.h
branches/tile/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/tile/source/gameengine/Rasterizer/CMakeLists.txt
branches/tile/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/tile/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/tile/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/tile/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/tile/extern/libmv/libmv/tracking/brute_region_tracker.cc
branches/tile/extern/libmv/libmv/tracking/brute_region_tracker.h
branches/tile/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
branches/tile/extern/libmv/libmv/tracking/hybrid_region_tracker.h
branches/tile/extern/libmv/third_party/glog/src/config_freebsd.h
branches/tile/intern/cycles/app/io_export_cycles_xml.py
branches/tile/intern/cycles/kernel/SConscript
branches/tile/intern/cycles/kernel/osl/nodes/node_camera.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
branches/tile/intern/cycles/kernel/svm/svm_camera.h
branches/tile/intern/cycles/kernel/svm/svm_gamma.h
branches/tile/intern/cycles/kernel/svm/svm_hsv.h
branches/tile/intern/cycles/kernel/svm/svm_invert.h
branches/tile/intern/cycles/kernel/svm/svm_normal.h
branches/tile/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
branches/tile/intern/dualcon/
branches/tile/intern/dualcon/CMakeLists.txt
branches/tile/intern/dualcon/SConscript
branches/tile/intern/dualcon/dualcon.h
branches/tile/intern/dualcon/intern/
branches/tile/intern/dualcon/intern/GeoCommon.h
branches/tile/intern/dualcon/intern/MemoryAllocator.h
branches/tile/intern/dualcon/intern/ModelReader.h
branches/tile/intern/dualcon/intern/Projections.cpp
branches/tile/intern/dualcon/intern/Projections.h
branches/tile/intern/dualcon/intern/Queue.h
branches/tile/intern/dualcon/intern/cubes.h
branches/tile/intern/dualcon/intern/dualcon_c_api.cpp
branches/tile/intern/dualcon/intern/manifold_table.cpp
branches/tile/intern/dualcon/intern/manifold_table.h
branches/tile/intern/dualcon/intern/marching_cubes_table.cpp
branches/tile/intern/dualcon/intern/marching_cubes_table.h
branches/tile/intern/dualcon/intern/octree.cpp
branches/tile/intern/dualcon/intern/octree.h
branches/tile/intern/dualcon/intern/readme.txt
branches/tile/release/scripts/modules/rna_xml.py
branches/tile/release/scripts/presets/tracking_settings/blurry_footage.py
branches/tile/release/scripts/presets/tracking_track_color/object.py
branches/tile/source/blender/blenkernel/intern/editderivedmesh.c
branches/tile/source/blender/blenlib/BLI_array.h
branches/tile/source/blender/blenlib/BLI_md5.h
branches/tile/source/blender/blenlib/intern/math_color_inline.c
branches/tile/source/blender/blenlib/intern/md5.c
branches/tile/source/blender/makesdna/DNA_defs.h
branches/tile/source/blender/modifiers/intern/MOD_remesh.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/tile/source/blender/python/intern/bpy_app_ffmpeg.c
branches/tile/source/blender/python/intern/bpy_app_ffmpeg.h
branches/tile/source/tests/bl_pyapi_mathutils.py
Removed Paths:
-------------
branches/tile/intern/cycles/blender/addon/xml.py
branches/tile/intern/dualcon/CMakeLists.txt
branches/tile/intern/dualcon/SConscript
branches/tile/intern/dualcon/dualcon.h
branches/tile/intern/dualcon/intern/
branches/tile/intern/dualcon/intern/GeoCommon.h
branches/tile/intern/dualcon/intern/MemoryAllocator.h
branches/tile/intern/dualcon/intern/ModelReader.h
branches/tile/intern/dualcon/intern/Projections.cpp
branches/tile/intern/dualcon/intern/Projections.h
branches/tile/intern/dualcon/intern/Queue.h
branches/tile/intern/dualcon/intern/cubes.h
branches/tile/intern/dualcon/intern/dualcon_c_api.cpp
branches/tile/intern/dualcon/intern/manifold_table.cpp
branches/tile/intern/dualcon/intern/manifold_table.h
branches/tile/intern/dualcon/intern/marching_cubes_table.cpp
branches/tile/intern/dualcon/intern/marching_cubes_table.h
branches/tile/intern/dualcon/intern/octree.cpp
branches/tile/intern/dualcon/intern/octree.h
branches/tile/intern/dualcon/intern/readme.txt
branches/tile/release/scripts/presets/tracking_settings/blurry_movie.py
branches/tile/source/blender/imbuf/intern/md5.c
branches/tile/source/blender/imbuf/intern/md5.h
Property Changed:
----------------
branches/tile/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_background.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_math.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_value.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/tile/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/tile/source/blender/editors/space_outliner/
Modified: branches/tile/CMakeLists.txt
===================================================================
--- branches/tile/CMakeLists.txt 2012-01-03 04:03:41 UTC (rev 43091)
+++ branches/tile/CMakeLists.txt 2012-01-03 04:23:41 UTC (rev 43092)
@@ -156,6 +156,7 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
+ option(WITH_X11_XF86VMODE "Enable X11 video mode switching" OFF)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
mark_as_advanced(WITH_XDG_USER_DIRS)
@@ -169,6 +170,7 @@
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
@@ -281,10 +283,12 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-if(WITH_CODEC_QUICKTIME AND MINGW)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
+if(MINGW)
+ if(WITH_CODEC_QUICKTIME)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+ endif()
endif()
if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
@@ -581,6 +585,17 @@
if(WITH_X11_XINPUT)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
endif()
+
+ if(WITH_X11_XF86VMODE)
+ # XXX, why dont cmake make this available?
+ FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
+ mark_as_advanced(X11_Xxf86vmode_LIB)
+ if(X11_Xxf86vmode_LIB)
+ set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xxf86vmode_LIB}")
+ else()
+ set(WITH_X11_XF86VMODE OFF)
+ endif()
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -649,10 +664,6 @@
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
- set(PNG "${LIBDIR}/png")
- set(PNG_INCLUDE_DIR "${PNG}/include")
- set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-
set(JPEG "${LIBDIR}/jpeg")
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -662,7 +673,7 @@
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- set(OPENAL_LIBRARY wrap_oal)
+ set(OPENAL_LIBRARY OpenAL32)
set(OPENAL_LIBPATH ${OPENAL}/lib)
endif()
@@ -727,12 +738,12 @@
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
- if(CMAKE_CL_64)
- set(PNG_LIBRARIES libpng)
- else()
- set(PNG_LIBRARIES libpng_st)
- endif()
+ set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
+
+ set(PNG "${LIBDIR}/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
if(CMAKE_CL_64)
@@ -767,22 +778,27 @@
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
+
+ set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
set(OPENCOLLADA_LIBRARIES
- ${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
- ${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
- ${LIBDIR}/opencollada/lib/MathMLSolver.lib
- ${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
- ${LIBDIR}/opencollada/lib/xml2.lib
- ${LIBDIR}/opencollada/lib/buffer.lib
- ${LIBDIR}/opencollada/lib/ftoa.lib
- ${LIBDIR}/opencollada/lib/UTF.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
+ ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
+ ${OPENCOLLADA_LIBPATH}/xml2.lib
+ ${OPENCOLLADA_LIBPATH}/buffer.lib
+ ${OPENCOLLADA_LIBPATH}/ftoa.lib
+ ${OPENCOLLADA_LIBPATH}/UTF.lib
)
set(PCRE_LIBRARIES
- ${LIBDIR}/opencollada/lib/pcre.lib
+ ${OPENCOLLADA_LIBPATH}/pcre.lib
)
+
+ unset(OPENCOLLADA_LIBPATH)
+
endif()
if(WITH_CODEC_FFMPEG)
@@ -800,18 +816,8 @@
endif()
if(WITH_IMAGE_OPENEXR)
- if(MSVC90)
- set(MSVC_LIB _vs2008)
- set(MSVC_INC)
- elseif(MSVC10)
- set(MSVC_LIB _vs2010)
- set(MSVC_INC _vs2010)
- else()
- set(MSVC_LIB msvc)
- set(MSVC_INC)
- endif()
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set_lib_path(OPENEXR "openexr")
+ set_lib_path(OPENEXR_LIBPATH "openexr/lib")
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib
@@ -819,7 +825,7 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+ set_lib_path(OPENEXR_INCUDE "openexr/include")
set(OPENEXR_INCLUDE_DIRS
${OPENEXR_INCUDE}
${OPENEXR_INCUDE}/IlmImf
@@ -846,9 +852,9 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
- set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
- set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
-
+ set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
+ set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -857,14 +863,23 @@
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")
+ if(MSVC10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ else()
+ set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ endif()
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)
+ optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
+ optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+ debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+ debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
+ if(MSVC10)
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ else()
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
@@ -872,7 +887,7 @@
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
- set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+ set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
set(OPENIMAGEIO_DEFINITIONS)
endif()
@@ -904,6 +919,10 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES intl)
endif()
+
+ set(PNG "${LIBDIR}/gcc/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(JPEG_LIBRARIES libjpeg)
set(PNG_LIBRARIES png)
@@ -1386,8 +1405,11 @@
# disable because it gives warnings for printf() & friends.
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+ if(NOT APPLE)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+ endif()
+
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
@@ -1398,8 +1420,11 @@
# flags to undo strict flags
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
- ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
+ if(NOT APPLE)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+ endif()
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1420,11 +1445,9 @@
if(MSVC10)
if(WITH_IMAGE_OPENEXR)
message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
- set(WITH_IMAGE_OPENEXR OFF)
endif()
if(WITH_OPENCOLLADA)
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
- set(WITH_OPENCOLLADA OFF)
endif()
endif()
@@ -1536,6 +1559,7 @@
info_cfg_text("System Options:")
info_cfg_option(WITH_INSTALL_PORTABLE)
+ info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_BUILTIN_GLEW)
@@ -1566,6 +1590,7 @@
info_cfg_text("Modifiers:")
info_cfg_option(WITH_MOD_BOOLEAN)
+ info_cfg_option(WITH_MOD_REMESH)
info_cfg_option(WITH_MOD_DECIMATE)
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list