[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29289] branches/soc-2010-merwin: merged 28477:29285 from trunk
Mike Erwin
significant.bit at gmail.com
Mon Jun 7 02:08:02 CEST 2010
Revision: 29289
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29289
Author: merwin
Date: 2010-06-07 02:08:01 +0200 (Mon, 07 Jun 2010)
Log Message:
-----------
merged 28477:29285 from trunk
Modified Paths:
--------------
branches/soc-2010-merwin/CMake/macros.cmake
branches/soc-2010-merwin/CMakeLists.txt
branches/soc-2010-merwin/SConstruct
branches/soc-2010-merwin/config/aix4-config.py
branches/soc-2010-merwin/config/darwin-config.py
branches/soc-2010-merwin/config/linux2-config.py
branches/soc-2010-merwin/config/linuxcross-config.py
branches/soc-2010-merwin/config/win32-mingw-config.py
branches/soc-2010-merwin/config/win32-vc-config.py
branches/soc-2010-merwin/config/win64-vc-config.py
branches/soc-2010-merwin/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/soc-2010-merwin/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2010-merwin/intern/audaspace/intern/AUD_FileFactory.cpp
branches/soc-2010-merwin/intern/ghost/CMakeLists.txt
branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h
branches/soc-2010-merwin/intern/ghost/GHOST_IWindow.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-merwin/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_Window.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-merwin/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2010-merwin/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-merwin/intern/guardedalloc/intern/mallocn.c
branches/soc-2010-merwin/intern/string/STR_String.h
branches/soc-2010-merwin/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2010-merwin/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2010-merwin/release/datafiles/blenderbuttons
branches/soc-2010-merwin/release/scripts/io/engine_render_pov.py
branches/soc-2010-merwin/release/scripts/io/export_3ds.py
branches/soc-2010-merwin/release/scripts/io/export_fbx.py
branches/soc-2010-merwin/release/scripts/io/export_mdd.py
branches/soc-2010-merwin/release/scripts/io/export_obj.py
branches/soc-2010-merwin/release/scripts/io/export_ply.py
branches/soc-2010-merwin/release/scripts/io/export_x3d.py
branches/soc-2010-merwin/release/scripts/io/import_anim_bvh.py
branches/soc-2010-merwin/release/scripts/io/import_shape_mdd.py
branches/soc-2010-merwin/release/scripts/io/netrender/__init__.py
branches/soc-2010-merwin/release/scripts/io/netrender/client.py
branches/soc-2010-merwin/release/scripts/io/netrender/master.py
branches/soc-2010-merwin/release/scripts/io/netrender/master_html.py
branches/soc-2010-merwin/release/scripts/io/netrender/model.py
branches/soc-2010-merwin/release/scripts/io/netrender/netrender.css
branches/soc-2010-merwin/release/scripts/io/netrender/operators.py
branches/soc-2010-merwin/release/scripts/io/netrender/slave.py
branches/soc-2010-merwin/release/scripts/io/netrender/ui.py
branches/soc-2010-merwin/release/scripts/io/netrender/utils.py
branches/soc-2010-merwin/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2010-merwin/release/scripts/modules/bpy/__init__.py
branches/soc-2010-merwin/release/scripts/modules/bpy/utils.py
branches/soc-2010-merwin/release/scripts/modules/bpy_types.py
branches/soc-2010-merwin/release/scripts/modules/graphviz_export.py
branches/soc-2010-merwin/release/scripts/modules/rigify/__init__.py
branches/soc-2010-merwin/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-merwin/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-merwin/release/scripts/modules/rigify/eye_lid.py
branches/soc-2010-merwin/release/scripts/modules/rigify/finger_curl.py
branches/soc-2010-merwin/release/scripts/modules/rigify/leg_biped.py
branches/soc-2010-merwin/release/scripts/modules/rigify/leg_quadruped.py
branches/soc-2010-merwin/release/scripts/modules/rigify/mouth.py
branches/soc-2010-merwin/release/scripts/modules/rigify/neck.py
branches/soc-2010-merwin/release/scripts/modules/rigify/neck_flex.py
branches/soc-2010-merwin/release/scripts/modules/rigify/palm_curl.py
branches/soc-2010-merwin/release/scripts/modules/rigify/shape_key_control.py
branches/soc-2010-merwin/release/scripts/modules/rigify/shape_key_distance.py
branches/soc-2010-merwin/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/soc-2010-merwin/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-merwin/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-merwin/release/scripts/modules/rigify/tongue.py
branches/soc-2010-merwin/release/scripts/modules/rigify_utils.py
branches/soc-2010-merwin/release/scripts/modules/rna_info.py
branches/soc-2010-merwin/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-merwin/release/scripts/op/add_mesh_torus.py
branches/soc-2010-merwin/release/scripts/op/console_python.py
branches/soc-2010-merwin/release/scripts/op/image.py
branches/soc-2010-merwin/release/scripts/op/nla.py
branches/soc-2010-merwin/release/scripts/op/object.py
branches/soc-2010-merwin/release/scripts/op/presets.py
branches/soc-2010-merwin/release/scripts/op/sequencer.py
branches/soc-2010-merwin/release/scripts/op/uv.py
branches/soc-2010-merwin/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-merwin/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-merwin/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-merwin/release/scripts/op/wm.py
branches/soc-2010-merwin/release/scripts/ui/properties_animviz.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_armature.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_bone.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_camera.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_curve.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_empty.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-merwin/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-merwin/release/scripts/ui/properties_game.py
branches/soc-2010-merwin/release/scripts/ui/properties_material.py
branches/soc-2010-merwin/release/scripts/ui/properties_object.py
branches/soc-2010-merwin/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-merwin/release/scripts/ui/properties_particle.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_common.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_field.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-merwin/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-merwin/release/scripts/ui/properties_render.py
branches/soc-2010-merwin/release/scripts/ui/properties_scene.py
branches/soc-2010-merwin/release/scripts/ui/properties_texture.py
branches/soc-2010-merwin/release/scripts/ui/properties_world.py
branches/soc-2010-merwin/release/scripts/ui/space_image.py
branches/soc-2010-merwin/release/scripts/ui/space_info.py
branches/soc-2010-merwin/release/scripts/ui/space_logic.py
branches/soc-2010-merwin/release/scripts/ui/space_node.py
branches/soc-2010-merwin/release/scripts/ui/space_outliner.py
branches/soc-2010-merwin/release/scripts/ui/space_sequencer.py
branches/soc-2010-merwin/release/scripts/ui/space_text.py
branches/soc-2010-merwin/release/scripts/ui/space_time.py
branches/soc-2010-merwin/release/scripts/ui/space_userpref.py
branches/soc-2010-merwin/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-merwin/release/scripts/ui/space_view3d.py
branches/soc-2010-merwin/source/blender/blenkernel/BKE_colortools.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_constraint.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_customdata.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_global.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_image.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_particle.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_report.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_smoke.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2010-merwin/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2010-merwin/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-merwin/source/blender/blenkernel/SConscript
branches/soc-2010-merwin/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/Makefile
branches/soc-2010-merwin/source/blender/blenkernel/intern/action.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/anim.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/armature.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/blender.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/bmfont.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/brush.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/collision.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/displist.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/fcurve.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/group.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/icons.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/image.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/library.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/multires.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/nla.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/node.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/object.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/particle.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/report.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sca.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/scene.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/sound.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/text.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/texture.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/writeavi.c
branches/soc-2010-merwin/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-merwin/source/blender/blenlib/BLI_args.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_bpath.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_fileops.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_ghash.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_pbvh.h
branches/soc-2010-merwin/source/blender/blenlib/BLI_storage.h
branches/soc-2010-merwin/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-merwin/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2010-merwin/source/blender/blenlib/intern/bpath.c
branches/soc-2010-merwin/source/blender/blenlib/intern/fileops.c
branches/soc-2010-merwin/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-merwin/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2010-merwin/source/blender/blenlib/intern/path_util.c
branches/soc-2010-merwin/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-merwin/source/blender/blenlib/intern/storage.c
branches/soc-2010-merwin/source/blender/blenlib/intern/threads.c
branches/soc-2010-merwin/source/blender/blenloader/BLO_readfile.h
branches/soc-2010-merwin/source/blender/blenloader/BLO_writefile.h
branches/soc-2010-merwin/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-merwin/source/blender/blenloader/intern/readfile.c
branches/soc-2010-merwin/source/blender/blenloader/intern/writefile.c
branches/soc-2010-merwin/source/blender/blenpluginapi/iff.h
branches/soc-2010-merwin/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2010-merwin/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-merwin/source/blender/collada/DocumentExporter.h
branches/soc-2010-merwin/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-merwin/source/blender/collada/DocumentImporter.h
branches/soc-2010-merwin/source/blender/collada/Makefile
branches/soc-2010-merwin/source/blender/collada/SConscript
branches/soc-2010-merwin/source/blender/collada/collada.cpp
branches/soc-2010-merwin/source/blender/collada/collada.h
branches/soc-2010-merwin/source/blender/collada/collada_internal.h
branches/soc-2010-merwin/source/blender/editors/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_draw.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_filter.c
branches/soc-2010-merwin/source/blender/editors/animation/anim_markers.c
branches/soc-2010-merwin/source/blender/editors/animation/keyframing.c
branches/soc-2010-merwin/source/blender/editors/animation/keyingsets.c
branches/soc-2010-merwin/source/blender/editors/armature/armature_ops.c
branches/soc-2010-merwin/source/blender/editors/armature/editarmature.c
branches/soc-2010-merwin/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2010-merwin/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-merwin/source/blender/editors/armature/poselib.c
branches/soc-2010-merwin/source/blender/editors/armature/poseobject.c
branches/soc-2010-merwin/source/blender/editors/armature/reeb.c
branches/soc-2010-merwin/source/blender/editors/curve/curve_intern.h
branches/soc-2010-merwin/source/blender/editors/curve/curve_ops.c
branches/soc-2010-merwin/source/blender/editors/curve/editcurve.c
branches/soc-2010-merwin/source/blender/editors/datafiles/B.blend.c
branches/soc-2010-merwin/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2010-merwin/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-merwin/source/blender/editors/include/ED_anim_api.h
branches/soc-2010-merwin/source/blender/editors/include/ED_curve.h
branches/soc-2010-merwin/source/blender/editors/include/ED_gpencil.h
branches/soc-2010-merwin/source/blender/editors/include/ED_physics.h
branches/soc-2010-merwin/source/blender/editors/include/ED_view3d.h
branches/soc-2010-merwin/source/blender/editors/include/UI_icons.h
branches/soc-2010-merwin/source/blender/editors/include/UI_interface.h
branches/soc-2010-merwin/source/blender/editors/include/UI_resources.h
branches/soc-2010-merwin/source/blender/editors/include/UI_view2d.h
branches/soc-2010-merwin/source/blender/editors/interface/interface.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_draw.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_icons.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_intern.h
branches/soc-2010-merwin/source/blender/editors/interface/interface_layout.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_regions.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_templates.c
branches/soc-2010-merwin/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-merwin/source/blender/editors/interface/resources.c
branches/soc-2010-merwin/source/blender/editors/interface/view2d.c
branches/soc-2010-merwin/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-merwin/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-merwin/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-merwin/source/blender/editors/mesh/meshtools.c
branches/soc-2010-merwin/source/blender/editors/metaball/mball_ops.c
branches/soc-2010-merwin/source/blender/editors/object/object_add.c
branches/soc-2010-merwin/source/blender/editors/object/object_bake.c
branches/soc-2010-merwin/source/blender/editors/object/object_constraint.c
branches/soc-2010-merwin/source/blender/editors/object/object_edit.c
branches/soc-2010-merwin/source/blender/editors/object/object_group.c
branches/soc-2010-merwin/source/blender/editors/object/object_intern.h
branches/soc-2010-merwin/source/blender/editors/object/object_modifier.c
branches/soc-2010-merwin/source/blender/editors/object/object_ops.c
branches/soc-2010-merwin/source/blender/editors/object/object_relations.c
branches/soc-2010-merwin/source/blender/editors/object/object_select.c
branches/soc-2010-merwin/source/blender/editors/object/object_vgroup.c
branches/soc-2010-merwin/source/blender/editors/physics/particle_edit.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_intern.h
branches/soc-2010-merwin/source/blender/editors/physics/physics_ops.c
branches/soc-2010-merwin/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-merwin/source/blender/editors/render/render_internal.c
branches/soc-2010-merwin/source/blender/editors/render/render_opengl.c
branches/soc-2010-merwin/source/blender/editors/render/render_preview.c
branches/soc-2010-merwin/source/blender/editors/render/render_shading.c
branches/soc-2010-merwin/source/blender/editors/screen/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/screen/SConscript
branches/soc-2010-merwin/source/blender/editors/screen/area.c
branches/soc-2010-merwin/source/blender/editors/screen/screen_ops.c
branches/soc-2010-merwin/source/blender/editors/screen/screendump.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-merwin/source/blender/editors/sound/SConscript
branches/soc-2010-merwin/source/blender/editors/sound/sound_ops.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_edit.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_ops.c
branches/soc-2010-merwin/source/blender/editors/space_action/action_select.c
branches/soc-2010-merwin/source/blender/editors/space_api/SConscript
branches/soc-2010-merwin/source/blender/editors/space_api/spacetypes.c
branches/soc-2010-merwin/source/blender/editors/space_buttons/SConscript
branches/soc-2010-merwin/source/blender/editors/space_console/Makefile
branches/soc-2010-merwin/source/blender/editors/space_console/SConscript
branches/soc-2010-merwin/source/blender/editors/space_console/space_console.c
branches/soc-2010-merwin/source/blender/editors/space_file/Makefile
branches/soc-2010-merwin/source/blender/editors/space_file/SConscript
branches/soc-2010-merwin/source/blender/editors/space_file/file_draw.c
branches/soc-2010-merwin/source/blender/editors/space_file/file_intern.h
branches/soc-2010-merwin/source/blender/editors/space_file/file_ops.c
branches/soc-2010-merwin/source/blender/editors/space_file/filelist.c
branches/soc-2010-merwin/source/blender/editors/space_file/filelist.h
branches/soc-2010-merwin/source/blender/editors/space_file/filesel.c
branches/soc-2010-merwin/source/blender/editors/space_file/space_file.c
branches/soc-2010-merwin/source/blender/editors/space_file/writeimage.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_draw.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-merwin/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-merwin/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-merwin/source/blender/editors/space_image/Makefile
branches/soc-2010-merwin/source/blender/editors/space_image/SConscript
branches/soc-2010-merwin/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_image/image_draw.c
branches/soc-2010-merwin/source/blender/editors/space_image/image_ops.c
branches/soc-2010-merwin/source/blender/editors/space_image/space_image.c
branches/soc-2010-merwin/source/blender/editors/space_info/SConscript
branches/soc-2010-merwin/source/blender/editors/space_info/info_intern.h
branches/soc-2010-merwin/source/blender/editors/space_info/info_ops.c
branches/soc-2010-merwin/source/blender/editors/space_info/space_info.c
branches/soc-2010-merwin/source/blender/editors/space_logic/logic_intern.h
branches/soc-2010-merwin/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-merwin/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-merwin/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-merwin/source/blender/editors/space_node/drawnode.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_draw.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_edit.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_intern.h
branches/soc-2010-merwin/source/blender/editors/space_node/node_ops.c
branches/soc-2010-merwin/source/blender/editors/space_node/node_select.c
branches/soc-2010-merwin/source/blender/editors/space_node/space_node.c
branches/soc-2010-merwin/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-merwin/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2010-merwin/source/blender/editors/space_script/script_edit.c
branches/soc-2010-merwin/source/blender/editors/space_script/script_intern.h
branches/soc-2010-merwin/source/blender/editors/space_script/script_ops.c
branches/soc-2010-merwin/source/blender/editors/space_script/space_script.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-merwin/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-merwin/source/blender/editors/space_text/space_text.c
branches/soc-2010-merwin/source/blender/editors/space_userpref/SConscript
branches/soc-2010-merwin/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-merwin/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-merwin/source/blender/editors/transform/transform.c
branches/soc-2010-merwin/source/blender/editors/transform/transform.h
branches/soc-2010-merwin/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_generics.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_ops.c
branches/soc-2010-merwin/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-merwin/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-merwin/source/blender/gpu/GPU_draw.h
branches/soc-2010-merwin/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-merwin/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-merwin/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-merwin/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-merwin/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2010-merwin/source/blender/imbuf/IMB_thumbs.h
branches/soc-2010-merwin/source/blender/imbuf/SConscript
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2010-merwin/source/blender/imbuf/intern/Makefile
branches/soc-2010-merwin/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-merwin/source/blender/imbuf/intern/anim.c
branches/soc-2010-merwin/source/blender/imbuf/intern/bmp.c
branches/soc-2010-merwin/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2010-merwin/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2010-merwin/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2010-merwin/source/blender/imbuf/intern/divers.c
branches/soc-2010-merwin/source/blender/imbuf/intern/filter.c
branches/soc-2010-merwin/source/blender/imbuf/intern/imageprocess.c
branches/soc-2010-merwin/source/blender/imbuf/intern/imbuf.h
branches/soc-2010-merwin/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2010-merwin/source/blender/imbuf/intern/iris.c
branches/soc-2010-merwin/source/blender/imbuf/intern/jp2.c
branches/soc-2010-merwin/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-merwin/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-merwin/source/blender/imbuf/intern/openexr/openexr_api.h
branches/soc-2010-merwin/source/blender/imbuf/intern/png.c
branches/soc-2010-merwin/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2010-merwin/source/blender/imbuf/intern/readimage.c
branches/soc-2010-merwin/source/blender/imbuf/intern/rectop.c
branches/soc-2010-merwin/source/blender/imbuf/intern/rotate.c
branches/soc-2010-merwin/source/blender/imbuf/intern/scaling.c
branches/soc-2010-merwin/source/blender/imbuf/intern/targa.c
branches/soc-2010-merwin/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-merwin/source/blender/imbuf/intern/tiff.c
branches/soc-2010-merwin/source/blender/imbuf/intern/util.c
branches/soc-2010-merwin/source/blender/imbuf/intern/writeimage.c
branches/soc-2010-merwin/source/blender/makesdna/DNA_ID.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_color_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_controller_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_image_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_object_force.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-merwin/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2010-merwin/source/blender/makesrna/RNA_access.h
branches/soc-2010-merwin/source/blender/makesrna/RNA_define.h
branches/soc-2010-merwin/source/blender/makesrna/RNA_enum_types.h
branches/soc-2010-merwin/source/blender/makesrna/RNA_types.h
branches/soc-2010-merwin/source/blender/makesrna/SConscript
branches/soc-2010-merwin/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-merwin/source/blender/makesrna/intern/Makefile
branches/soc-2010-merwin/source/blender/makesrna/intern/SConscript
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_main.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_meta.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_property.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_sound.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-merwin/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_build.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_util.c
branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-merwin/source/blender/python/BPY_extern.h
branches/soc-2010-merwin/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-merwin/source/blender/python/doc/sphinx_doc_gen.sh
branches/soc-2010-merwin/source/blender/python/generic/bgl.c
branches/soc-2010-merwin/source/blender/python/generic/blf_api.c
branches/soc-2010-merwin/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-merwin/source/blender/python/generic/bpy_internal_import.h
branches/soc-2010-merwin/source/blender/python/generic/mathutils_color.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-merwin/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-merwin/source/blender/python/intern/bpy.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_app.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_driver.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_interface.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_props.c
branches/soc-2010-merwin/source/blender/python/intern/bpy_props.h
branches/soc-2010-merwin/source/blender/python/intern/bpy_rna.c
branches/soc-2010-merwin/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2010-merwin/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2010-merwin/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-merwin/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2010-merwin/source/blender/render/intern/include/render_types.h
branches/soc-2010-merwin/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2010-merwin/source/blender/render/intern/source/convertblender.c
branches/soc-2010-merwin/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-merwin/source/blender/render/intern/source/pipeline.c
branches/soc-2010-merwin/source/blender/render/intern/source/rendercore.c
branches/soc-2010-merwin/source/blender/render/intern/source/sss.c
branches/soc-2010-merwin/source/blender/render/intern/source/strand.c
branches/soc-2010-merwin/source/blender/render/intern/source/texture.c
branches/soc-2010-merwin/source/blender/render/intern/source/voxeldata.c
branches/soc-2010-merwin/source/blender/windowmanager/WM_api.h
branches/soc-2010-merwin/source/blender/windowmanager/WM_types.h
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-merwin/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-merwin/source/blenderplayer/CMakeLists.txt
branches/soc-2010-merwin/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-merwin/source/creator/CMakeLists.txt
branches/soc-2010-merwin/source/creator/Makefile
branches/soc-2010-merwin/source/creator/SConscript
branches/soc-2010-merwin/source/creator/creator.c
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2010-merwin/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/soc-2010-merwin/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2010-merwin/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2010-merwin/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-merwin/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-merwin/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2010-merwin/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2010-merwin/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2010-merwin/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/soc-2010-merwin/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2010-merwin/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2010-merwin/source/gameengine/Expressions/BoolValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/ConstExpr.h
branches/soc-2010-merwin/source/gameengine/Expressions/EmptyValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/ErrorValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/Expression.h
branches/soc-2010-merwin/source/gameengine/Expressions/FloatValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/IdentifierExpr.h
branches/soc-2010-merwin/source/gameengine/Expressions/IfExpr.h
branches/soc-2010-merwin/source/gameengine/Expressions/InputParser.h
branches/soc-2010-merwin/source/gameengine/Expressions/IntValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/KX_HashedPtr.h
branches/soc-2010-merwin/source/gameengine/Expressions/ListValue.cpp
branches/soc-2010-merwin/source/gameengine/Expressions/Operator1Expr.h
branches/soc-2010-merwin/source/gameengine/Expressions/Operator2Expr.h
branches/soc-2010-merwin/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2010-merwin/source/gameengine/Expressions/StringValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/Value.h
branches/soc-2010-merwin/source/gameengine/Expressions/VectorValue.h
branches/soc-2010-merwin/source/gameengine/Expressions/VoidValue.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_BasicEventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_MouseManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/soc-2010-merwin/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2010-merwin/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2010-merwin/source/gameengine/Ketsji/BL_Material.h
branches/soc-2010-merwin/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2010-merwin/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_EmptyObject.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_IInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_IScalarInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ISystem.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_MotionState.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PositionInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_RayCast.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ScalarInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_ScalingInterpolator.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_WorldInfo.h
branches/soc-2010-merwin/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/soc-2010-merwin/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
branches/soc-2010-merwin/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/soc-2010-merwin/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2010-merwin/source/gameengine/Network/NG_NetworkMessage.h
branches/soc-2010-merwin/source/gameengine/Network/NG_NetworkObject.h
branches/soc-2010-merwin/source/gameengine/Network/NG_NetworkScene.h
branches/soc-2010-merwin/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
branches/soc-2010-merwin/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/soc-2010-merwin/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2010-merwin/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2010-merwin/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IController.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IMotionState.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2010-merwin/source/gameengine/Physics/common/PHY_IVehicle.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_Polygon.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_Rect.h
branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_BBox.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_Controller.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_QList.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_Spatial.h
branches/soc-2010-merwin/source/gameengine/SceneGraph/SG_Tree.h
branches/soc-2010-merwin/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2010-merwin/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2010-merwin/source/nan_definitions.mk
branches/soc-2010-merwin/source/nan_link.mk
branches/soc-2010-merwin/tools/Blender.py
branches/soc-2010-merwin/tools/btools.py
branches/soc-2010-merwin/tools/crossmingw.py
Added Paths:
-----------
branches/soc-2010-merwin/release/scripts/io/netrender/repath.py
branches/soc-2010-merwin/release/scripts/modules/add_object_utils.py
branches/soc-2010-merwin/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-merwin/source/blender/editors/animation/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/armature/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/curve/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/include/ED_logic.h
branches/soc-2010-merwin/source/blender/editors/interface/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/object/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/physics/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/sound/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-merwin/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/transform/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/util/CMakeLists.txt
branches/soc-2010-merwin/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_metadata.h
branches/soc-2010-merwin/source/blender/imbuf/intern/cache.c
branches/soc-2010-merwin/source/blender/imbuf/intern/filetype.c
branches/soc-2010-merwin/source/blender/imbuf/intern/metadata.c
branches/soc-2010-merwin/source/blender/imbuf/intern/module.c
branches/soc-2010-merwin/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2010-merwin/source/blender/python/doc/blender-org/
branches/soc-2010-merwin/source/blender/python/doc/blender-org/layout.html
branches/soc-2010-merwin/source/blender/python/doc/blender-org/page.html
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/bg.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/default.css_t
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/favicon.ico
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/jquery.sidebar.js
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/pygments.css
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rnd.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rndbl.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rndbr.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/theme.conf
branches/soc-2010-merwin/source/blender/python/doc/sphinx_html_compact.diff
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.events.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.render.rst
branches/soc-2010-merwin/source/gameengine/PyDoc/bge.types.rst
Removed Paths:
-------------
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_amiga.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_anim5.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_bitplanes.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_bmp.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_cmap.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_cocoa.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_divers.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_dpxcineon.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_ham.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_hamx.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_iff.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_imginfo.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_iris.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_jp2.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_jpeg.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_png.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_radiance_hdr.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_targa.h
branches/soc-2010-merwin/source/blender/imbuf/intern/IMB_tiff.h
branches/soc-2010-merwin/source/blender/imbuf/intern/amiga.c
branches/soc-2010-merwin/source/blender/imbuf/intern/anim5.c
branches/soc-2010-merwin/source/blender/imbuf/intern/antialias.c
branches/soc-2010-merwin/source/blender/imbuf/intern/bitplanes.c
branches/soc-2010-merwin/source/blender/imbuf/intern/cmap.c
branches/soc-2010-merwin/source/blender/imbuf/intern/cspace.c
branches/soc-2010-merwin/source/blender/imbuf/intern/data.c
branches/soc-2010-merwin/source/blender/imbuf/intern/dither.c
branches/soc-2010-merwin/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2010-merwin/source/blender/imbuf/intern/dynlibtiff.h
branches/soc-2010-merwin/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/soc-2010-merwin/source/blender/imbuf/intern/ham.c
branches/soc-2010-merwin/source/blender/imbuf/intern/hamx.c
branches/soc-2010-merwin/source/blender/imbuf/intern/iff.c
branches/soc-2010-merwin/source/blender/imbuf/intern/imbuf_patch.h
branches/soc-2010-merwin/source/blender/imbuf/intern/imginfo.c
branches/soc-2010-merwin/source/blender/imbuf/intern/matrix.h
branches/soc-2010-merwin/source/blender/python/doc/blender-org/layout.html
branches/soc-2010-merwin/source/blender/python/doc/blender-org/page.html
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/bg.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/default.css_t
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/favicon.ico
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/jquery.sidebar.js
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/pygments.css
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rnd.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rndbl.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/static/rndbr.png
branches/soc-2010-merwin/source/blender/python/doc/blender-org/theme.conf
branches/soc-2010-merwin/source/gameengine/PyDoc/GameKeys.py
branches/soc-2010-merwin/source/gameengine/PyDoc/GameLogic.py
branches/soc-2010-merwin/source/gameengine/PyDoc/GameTypes.py
branches/soc-2010-merwin/source/gameengine/PyDoc/Rasterizer.py
Modified: branches/soc-2010-merwin/CMake/macros.cmake
===================================================================
--- branches/soc-2010-merwin/CMake/macros.cmake 2010-06-06 23:46:14 UTC (rev 29288)
+++ branches/soc-2010-merwin/CMake/macros.cmake 2010-06-07 00:08:01 UTC (rev 29289)
@@ -1,172 +1,183 @@
MACRO(BLENDERLIB_NOLIST
- name
- sources
- includes)
+ name
+ sources
+ includes)
- # Gather all headers
- FILE(GLOB_RECURSE INC_ALL *.h)
-
- INCLUDE_DIRECTORIES(${includes})
- ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+ # Gather all headers
+ FILE(GLOB_RECURSE INC_ALL *.h)
+
+ INCLUDE_DIRECTORIES(${includes})
+ ADD_LIBRARY(${name} ${INC_ALL} ${sources})
- # Group by location on disk
- SOURCE_GROUP(Files FILES CMakeLists.txt)
- SET(ALL_FILES ${sources} ${INC_ALL})
- FOREACH(SRC ${ALL_FILES})
- STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
- STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
- STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
- IF(REL_DIR)
- SOURCE_GROUP(${REL_DIR} FILES ${SRC})
- ELSE(REL_DIR)
- SOURCE_GROUP(Files FILES ${SRC})
- ENDIF(REL_DIR)
- ENDFOREACH(SRC)
+ # Group by location on disk
+ SOURCE_GROUP(Files FILES CMakeLists.txt)
+ SET(ALL_FILES ${sources} ${INC_ALL})
+ FOREACH(SRC ${ALL_FILES})
+ STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
+ STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
+ STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+ IF(REL_DIR)
+ SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+ ELSE(REL_DIR)
+ SOURCE_GROUP(Files FILES ${SRC})
+ ENDIF(REL_DIR)
+ ENDFOREACH(SRC)
- MESSAGE(STATUS "Configuring library ${name}")
+ MESSAGE(STATUS "Configuring library ${name}")
ENDMACRO(BLENDERLIB_NOLIST)
MACRO(BLENDERLIB
- name
- sources
- includes)
+ name
+ sources
+ includes)
- BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
+ BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
- # Add to blender's list of libraries
- FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
+ # Add to blender's list of libraries
+ FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
ENDMACRO(BLENDERLIB)
MACRO(SETUP_LIBDIRS)
- # see "cmake --help-policy CMP0003"
- if(COMMAND cmake_policy)
- CMAKE_POLICY(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
-
- LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
-
- IF(WITH_PYTHON)
- LINK_DIRECTORIES(${PYTHON_LIBPATH})
- ENDIF(WITH_PYTHON)
- IF(WITH_INTERNATIONAL)
- LINK_DIRECTORIES(${ICONV_LIBPATH})
- LINK_DIRECTORIES(${GETTEXT_LIBPATH})
- ENDIF(WITH_INTERNATIONAL)
- IF(WITH_SDL)
- LINK_DIRECTORIES(${SDL_LIBPATH})
- ENDIF(WITH_SDL)
- IF(WITH_FFMPEG)
- LINK_DIRECTORIES(${FFMPEG_LIBPATH})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENEXR)
- LINK_DIRECTORIES(${OPENEXR_LIBPATH})
- ENDIF(WITH_OPENEXR)
- IF(WITH_QUICKTIME)
- LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_OPENAL)
- LINK_DIRECTORIES(${OPENAL_LIBPATH})
- ENDIF(WITH_OPENAL)
- IF(WITH_JACK)
- LINK_DIRECTORIES(${JACK_LIBPATH})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- LINK_DIRECTORIES(${SNDFILE_LIBPATH})
- ENDIF(WITH_SNDFILE)
- IF(WITH_FFTW3)
- LINK_DIRECTORIES(${FFTW3_LIBPATH})
- ENDIF(WITH_FFTW3)
- IF(WITH_OPENCOLLADA)
- LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
- LINK_DIRECTORIES(${PCRE_LIBPATH})
- LINK_DIRECTORIES(${EXPAT_LIBPATH})
- ENDIF(WITH_OPENCOLLADA)
+ # see "cmake --help-policy CMP0003"
+ if(COMMAND cmake_policy)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
+
+ LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+
+ IF(WITH_PYTHON)
+ LINK_DIRECTORIES(${PYTHON_LIBPATH})
+ ENDIF(WITH_PYTHON)
+ IF(WITH_INTERNATIONAL)
+ LINK_DIRECTORIES(${ICONV_LIBPATH})
+ LINK_DIRECTORIES(${GETTEXT_LIBPATH})
+ ENDIF(WITH_INTERNATIONAL)
+ IF(WITH_SDL)
+ LINK_DIRECTORIES(${SDL_LIBPATH})
+ ENDIF(WITH_SDL)
+ IF(WITH_FFMPEG)
+ LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+ ENDIF(WITH_FFMPEG)
+ IF(WITH_OPENEXR)
+ LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+ ENDIF(WITH_OPENEXR)
+ IF(WITH_TIFF)
+ LINK_DIRECTORIES(${TIFF_LIBPATH})
+ ENDIF(WITH_TIFF)
+ IF(WITH_LCMS)
+ LINK_DIRECTORIES(${LCMS_LIBPATH})
+ ENDIF(WITH_LCMS)
+ IF(WITH_QUICKTIME)
+ LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
+ ENDIF(WITH_QUICKTIME)
+ IF(WITH_OPENAL)
+ LINK_DIRECTORIES(${OPENAL_LIBPATH})
+ ENDIF(WITH_OPENAL)
+ IF(WITH_JACK)
+ LINK_DIRECTORIES(${JACK_LIBPATH})
+ ENDIF(WITH_JACK)
+ IF(WITH_SNDFILE)
+ LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+ ENDIF(WITH_SNDFILE)
+ IF(WITH_FFTW3)
+ LINK_DIRECTORIES(${FFTW3_LIBPATH})
+ ENDIF(WITH_FFTW3)
+ IF(WITH_OPENCOLLADA)
+ LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+ LINK_DIRECTORIES(${PCRE_LIBPATH})
+ LINK_DIRECTORIES(${EXPAT_LIBPATH})
+ ENDIF(WITH_OPENCOLLADA)
- IF(WIN32)
- LINK_DIRECTORIES(${PTHREADS_LIBPATH})
- ENDIF(WIN32)
+ IF(WIN32)
+ LINK_DIRECTORIES(${PTHREADS_LIBPATH})
+ ENDIF(WIN32)
ENDMACRO(SETUP_LIBDIRS)
MACRO(SETUP_LIBLINKS
- target)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
+ target)
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ")
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
- # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
- IF(WITH_PYTHON)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_PYTHON)
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
+ # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+ IF(WITH_PYTHON)
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
- IF(WITH_INTERNATIONAL)
- TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_INTERNATIONAL)
-
- IF(WITH_OPENAL)
- TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
- ENDIF(WITH_OPENAL)
- IF(WITH_FFTW3)
- TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
- ENDIF(WITH_FFTW3)
- IF(WITH_JACK)
- TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
- ENDIF(WITH_SNDFILE)
- IF(WITH_SDL)
- TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
- ENDIF(WITH_SDL)
- IF(WITH_QUICKTIME)
- TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_OPENEXR)
- IF(WIN32)
- FOREACH(loop_var ${OPENEXR_LIB})
- TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
- ENDFOREACH(loop_var)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_OPENEXR)
- IF(WITH_FFMPEG)
- TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENCOLLADA)
- IF(WIN32)
- FOREACH(loop_var ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
- ENDFOREACH(loop_var)
- TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
- IF(EXPAT_LIB)
- TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
- ENDIF(EXPAT_LIB)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
- TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_OPENCOLLADA)
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
- ENDIF(WIN32)
+ IF(WIN32)
+ TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
+ ELSE(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
+ ENDIF(WIN32)
+ ENDIF(WITH_PYTHON)
+
+ TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB})
+ TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY} ${LIBSAMPLERATE_LIB})
+
+ IF(WITH_INTERNATIONAL)
+ TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
+
+ IF(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
+ ENDIF(WIN32)
+ ENDIF(WITH_INTERNATIONAL)
+
+ IF(WITH_OPENAL)
+ TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
+ ENDIF(WITH_OPENAL)
+ IF(WITH_FFTW3)
+ TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
+ ENDIF(WITH_FFTW3)
+ IF(WITH_JACK)
+ TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
+ ENDIF(WITH_JACK)
+ IF(WITH_SNDFILE)
+ TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+ ENDIF(WITH_SNDFILE)
+ IF(WITH_SDL)
+ TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
+ IF(WITH_QUICKTIME)
+ TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
+ ENDIF(WITH_QUICKTIME)
+ IF(WITH_TIFF)
+ TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+ ENDIF(WITH_TIFF)
+ IF(WITH_OPENEXR)
+ IF(WIN32)
+ FOREACH(loop_var ${OPENEXR_LIB})
+ TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+ ENDFOREACH(loop_var)
+ ELSE(WIN32)
+ TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
+ ENDIF(WIN32)
+ ENDIF(WITH_OPENEXR)
+ IF(WITH_LCMS)
+ TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY})
+ ENDIF(WITH_LCMS)
+ IF(WITH_FFMPEG)
+ TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
+ ENDIF(WITH_FFMPEG)
+ IF(WITH_OPENCOLLADA)
+ IF(WIN32)
+ FOREACH(loop_var ${OPENCOLLADA_LIB})
+ TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${loop_var})
+ ENDFOREACH(loop_var)
+ TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
+ TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list