Revision: 31142 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31142 Author: merwin Date: 2010-08-07 14:51:51 +0200 (Sat, 07 Aug 2010)
Log Message: ----------- merged 30707:31141 from trunk Modified Paths: -------------- branches/soc-2010-merwin/CMakeLists.txt branches/soc-2010-merwin/Makefile branches/soc-2010-merwin/SConstruct branches/soc-2010-merwin/build_files/cmake/macros.cmake branches/soc-2010-merwin/build_files/make/nan_compile.mk branches/soc-2010-merwin/build_files/make/nan_definitions.mk branches/soc-2010-merwin/build_files/make/nan_link.mk branches/soc-2010-merwin/build_files/scons/config/win32-vc-config.py branches/soc-2010-merwin/build_files/scons/config/win64-vc-config.py branches/soc-2010-merwin/build_files/scons/tools/Blender.py branches/soc-2010-merwin/build_files/scons/tools/btools.py branches/soc-2010-merwin/extern/CMakeLists.txt branches/soc-2010-merwin/intern/CMakeLists.txt branches/soc-2010-merwin/intern/audaspace/intern/AUD_IReader.h branches/soc-2010-merwin/intern/audaspace/intern/AUD_StreamBufferFactory.cpp branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCocoa.mm branches/soc-2010-merwin/intern/smoke/extern/smoke_API.h branches/soc-2010-merwin/intern/smoke/intern/FLUID_3D.cpp branches/soc-2010-merwin/intern/smoke/intern/FLUID_3D.h branches/soc-2010-merwin/intern/smoke/intern/smoke_API.cpp branches/soc-2010-merwin/po/Makefile branches/soc-2010-merwin/release/Makefile 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_scene_3ds.py branches/soc-2010-merwin/release/scripts/io/import_scene_obj.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/operators.py branches/soc-2010-merwin/release/scripts/io/netrender/repath.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/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/rigify/__init__.py branches/soc-2010-merwin/release/scripts/modules/rna_prop_ui.py branches/soc-2010-merwin/release/scripts/op/add_armature_human.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/fcurve_euler_filter.py branches/soc-2010-merwin/release/scripts/op/image.py branches/soc-2010-merwin/release/scripts/op/mesh.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/object_align.py branches/soc-2010-merwin/release/scripts/op/object_randomize_transform.py branches/soc-2010-merwin/release/scripts/op/presets.py branches/soc-2010-merwin/release/scripts/op/screen_play_rendered_anim.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/templates/operator.py branches/soc-2010-merwin/release/scripts/templates/operator_modal.py branches/soc-2010-merwin/release/scripts/templates/operator_modal_draw.py branches/soc-2010-merwin/release/scripts/templates/operator_modal_view3d.py branches/soc-2010-merwin/release/scripts/templates/operator_simple.py branches/soc-2010-merwin/release/scripts/templates/operator_uv.py branches/soc-2010-merwin/release/scripts/templates/panel_simple.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_console.py branches/soc-2010-merwin/release/scripts/ui/space_dopesheet.py branches/soc-2010-merwin/release/scripts/ui/space_filebrowser.py branches/soc-2010-merwin/release/scripts/ui/space_graph.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_nla.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/release/scripts/ui/space_view3d_toolbar.py branches/soc-2010-merwin/release/text/copyright.txt branches/soc-2010-merwin/source/Makefile branches/soc-2010-merwin/source/blender/CMakeLists.txt branches/soc-2010-merwin/source/blender/SConscript branches/soc-2010-merwin/source/blender/avi/CMakeLists.txt branches/soc-2010-merwin/source/blender/blenkernel/BKE_anim.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_armature.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_blender.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_brush.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_colortools.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_curve.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_depsgraph.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_displist.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_image.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_library.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_main.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_material.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_mesh.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_node.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_paint.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_pointcache.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_scene.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_sequencer.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_text.h branches/soc-2010-merwin/source/blender/blenkernel/BKE_texture.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_conversions.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/armature.c branches/soc-2010-merwin/source/blender/blenkernel/intern/blender.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/colortools.c branches/soc-2010-merwin/source/blender/blenkernel/intern/constraint.c branches/soc-2010-merwin/source/blender/blenkernel/intern/curve.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/effect.c branches/soc-2010-merwin/source/blender/blenkernel/intern/font.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/ipo.c branches/soc-2010-merwin/source/blender/blenkernel/intern/key.c branches/soc-2010-merwin/source/blender/blenkernel/intern/lattice.c branches/soc-2010-merwin/source/blender/blenkernel/intern/library.c branches/soc-2010-merwin/source/blender/blenkernel/intern/material.c branches/soc-2010-merwin/source/blender/blenkernel/intern/mesh.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/paint.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/scene.c branches/soc-2010-merwin/source/blender/blenkernel/intern/seqeffects.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/sound.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/world.c branches/soc-2010-merwin/source/blender/blenlib/BLI_math_rotation.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_storage_types.h branches/soc-2010-merwin/source/blender/blenlib/CMakeLists.txt branches/soc-2010-merwin/source/blender/blenlib/intern/bpath.c branches/soc-2010-merwin/source/blender/blenlib/intern/math_matrix.c branches/soc-2010-merwin/source/blender/blenlib/intern/math_rotation.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/storage.c 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/CMakeLists.txt branches/soc-2010-merwin/source/blender/collada/DocumentImporter.cpp branches/soc-2010-merwin/source/blender/editors/animation/anim_channels_edit.c branches/soc-2010-merwin/source/blender/editors/animation/anim_filter.c branches/soc-2010-merwin/source/blender/editors/animation/drivers.c branches/soc-2010-merwin/source/blender/editors/animation/keyframes_draw.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/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/poseobject.c 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/startup.blend.c branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_buttons.c branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_edit.c branches/soc-2010-merwin/source/blender/editors/gpencil/gpencil_paint.c branches/soc-2010-merwin/source/blender/editors/include/ED_armature.h branches/soc-2010-merwin/source/blender/editors/include/ED_curve.h branches/soc-2010-merwin/source/blender/editors/include/ED_datafiles.h branches/soc-2010-merwin/source/blender/editors/include/ED_object.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/interface/interface.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_layout.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/mesh/editmesh.c branches/soc-2010-merwin/source/blender/editors/mesh/editmesh_mods.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/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_hook.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_shapekey.c branches/soc-2010-merwin/source/blender/editors/object/object_transform.c branches/soc-2010-merwin/source/blender/editors/physics/CMakeLists.txt branches/soc-2010-merwin/source/blender/editors/physics/particle_boids.c branches/soc-2010-merwin/source/blender/editors/physics/particle_edit.c branches/soc-2010-merwin/source/blender/editors/physics/particle_object.c branches/soc-2010-merwin/source/blender/editors/physics/physics_fluid.c 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/area.c branches/soc-2010-merwin/source/blender/editors/screen/screen_edit.c branches/soc-2010-merwin/source/blender/editors/screen/screen_ops.c branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_image.c branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_stroke.c branches/soc-2010-merwin/source/blender/editors/sculpt_paint/paint_utils.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/sound_ops.c branches/soc-2010-merwin/source/blender/editors/space_action/action_select.c branches/soc-2010-merwin/source/blender/editors/space_buttons/buttons_context.c branches/soc-2010-merwin/source/blender/editors/space_buttons/space_buttons.c branches/soc-2010-merwin/source/blender/editors/space_file/CMakeLists.txt branches/soc-2010-merwin/source/blender/editors/space_file/Makefile branches/soc-2010-merwin/source/blender/editors/space_file/filelist.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_image/CMakeLists.txt branches/soc-2010-merwin/source/blender/editors/space_image/Makefile 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/info_stats.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_buttons.c branches/soc-2010-merwin/source/blender/editors/space_node/drawnode.c branches/soc-2010-merwin/source/blender/editors/space_node/node_edit.c branches/soc-2010-merwin/source/blender/editors/space_outliner/outliner.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_text/space_text.c branches/soc-2010-merwin/source/blender/editors/space_text/text_draw.c branches/soc-2010-merwin/source/blender/editors/space_text/text_ops.c branches/soc-2010-merwin/source/blender/editors/space_view3d/drawanimviz.c branches/soc-2010-merwin/source/blender/editors/space_view3d/drawarmature.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_conversions.c branches/soc-2010-merwin/source/blender/editors/transform/transform_generics.c branches/soc-2010-merwin/source/blender/editors/transform/transform_input.c branches/soc-2010-merwin/source/blender/editors/transform/transform_manipulator.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/transform/transform_snap.c branches/soc-2010-merwin/source/blender/editors/util/ed_util.c branches/soc-2010-merwin/source/blender/editors/uvedit/uvedit_ops.c branches/soc-2010-merwin/source/blender/gpu/GPU_material.h branches/soc-2010-merwin/source/blender/gpu/intern/gpu_material.c branches/soc-2010-merwin/source/blender/gpu/intern/gpu_shader_material.glsl branches/soc-2010-merwin/source/blender/gpu/intern/gpu_shader_material.glsl.c branches/soc-2010-merwin/source/blender/imbuf/CMakeLists.txt branches/soc-2010-merwin/source/blender/imbuf/IMB_imbuf_types.h branches/soc-2010-merwin/source/blender/imbuf/SConscript 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/cineon/CMakeLists.txt branches/soc-2010-merwin/source/blender/imbuf/intern/dds/CMakeLists.txt branches/soc-2010-merwin/source/blender/imbuf/intern/filetype.c branches/soc-2010-merwin/source/blender/imbuf/intern/jpeg.c branches/soc-2010-merwin/source/blender/imbuf/intern/openexr/CMakeLists.txt branches/soc-2010-merwin/source/blender/imbuf/intern/radiance_hdr.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/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_brush_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_constraint_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_mesh_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_node_types.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_sequence_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_smoke_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_sound_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_space_types.h branches/soc-2010-merwin/source/blender/makesdna/DNA_userdef_types.h branches/soc-2010-merwin/source/blender/makesdna/intern/makesdna.c 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/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/makesrna.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_brush.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_cloth.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_context.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_api.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_internal.h branches/soc-2010-merwin/source/blender/makesrna/intern/rna_internal_types.h branches/soc-2010-merwin/source/blender/makesrna/intern/rna_key.c 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_material.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_mesh.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_modifier.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_object.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_rna.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_scene.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_scene_api.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_screen.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_space.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_texture.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_ui.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_wm.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_wm_api.c branches/soc-2010-merwin/source/blender/makesrna/intern/rna_world.c branches/soc-2010-merwin/source/blender/modifiers/CMakeLists.txt branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_armature.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_array.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_boolean.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_cast.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_curve.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_displace.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_fluidsim.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_hook.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_lattice.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_mirror.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_screw.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_shrinkwrap.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_uvproject.c branches/soc-2010-merwin/source/blender/modifiers/intern/MOD_wave.c branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c branches/soc-2010-merwin/source/blender/nodes/intern/CMP_nodes/CMP_value.c branches/soc-2010-merwin/source/blender/nodes/intern/SHD_nodes/SHD_value.c branches/soc-2010-merwin/source/blender/python/SConscript branches/soc-2010-merwin/source/blender/python/doc/sphinx_doc_gen.py 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.c branches/soc-2010-merwin/source/blender/python/generic/mathutils.h 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_interface.c branches/soc-2010-merwin/source/blender/python/intern/bpy_rna.c branches/soc-2010-merwin/source/blender/quicktime/CMakeLists.txt branches/soc-2010-merwin/source/blender/quicktime/apple/Makefile branches/soc-2010-merwin/source/blender/readblenfile/CMakeLists.txt branches/soc-2010-merwin/source/blender/render/CMakeLists.txt branches/soc-2010-merwin/source/blender/render/extern/include/RE_pipeline.h branches/soc-2010-merwin/source/blender/render/intern/include/render_types.h branches/soc-2010-merwin/source/blender/render/intern/include/renderdatabase.h branches/soc-2010-merwin/source/blender/render/intern/include/texture.h branches/soc-2010-merwin/source/blender/render/intern/raytrace/Makefile branches/soc-2010-merwin/source/blender/render/intern/source/convertblender.c branches/soc-2010-merwin/source/blender/render/intern/source/envmap.c branches/soc-2010-merwin/source/blender/render/intern/source/occlusion.c branches/soc-2010-merwin/source/blender/render/intern/source/pipeline.c branches/soc-2010-merwin/source/blender/render/intern/source/pointdensity.c branches/soc-2010-merwin/source/blender/render/intern/source/rayshade.c branches/soc-2010-merwin/source/blender/render/intern/source/renderdatabase.c branches/soc-2010-merwin/source/blender/render/intern/source/shadeinput.c branches/soc-2010-merwin/source/blender/render/intern/source/shadeoutput.c branches/soc-2010-merwin/source/blender/render/intern/source/sss.c branches/soc-2010-merwin/source/blender/render/intern/source/texture.c branches/soc-2010-merwin/source/blender/render/intern/source/volumetric.c branches/soc-2010-merwin/source/blender/render/intern/source/voxeldata.c branches/soc-2010-merwin/source/blender/windowmanager/intern/wm_draw.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_operators.c 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/darwin/Makefile branches/soc-2010-merwin/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Converter/BL_ArmatureChannel.cpp branches/soc-2010-merwin/source/gameengine/Converter/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Converter/KX_ConvertControllers.cpp branches/soc-2010-merwin/source/gameengine/Expressions/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/GameLogic/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/GameLogic/SCA_PythonController.cpp branches/soc-2010-merwin/source/gameengine/GamePlayer/common/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/GamePlayer/ghost/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Ketsji/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Light.cpp branches/soc-2010-merwin/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2010-merwin/source/gameengine/Ketsji/KX_Scene.cpp branches/soc-2010-merwin/source/gameengine/Ketsji/Makefile branches/soc-2010-merwin/source/gameengine/Network/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Physics/Dummy/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Physics/common/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/PyDoc/bge.types.rst branches/soc-2010-merwin/source/gameengine/Rasterizer/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp branches/soc-2010-merwin/source/gameengine/SceneGraph/CMakeLists.txt branches/soc-2010-merwin/source/gameengine/VideoTexture/CMakeLists.txt branches/soc-2010-merwin/source/kernel/CMakeLists.txt Added Paths: ----------- branches/soc-2010-merwin/build_files/make/dlltool/ branches/soc-2010-merwin/build_files/make/dlltool/Makefile branches/soc-2010-merwin/build_files/make/dlltool/gettext.def branches/soc-2010-merwin/build_files/make/dlltool/iconv.def branches/soc-2010-merwin/build_files/make/dlltool/python.def branches/soc-2010-merwin/release/bin/ branches/soc-2010-merwin/release/bin/.blender/ branches/soc-2010-merwin/release/bin/.blender/.Blanguages branches/soc-2010-merwin/release/bin/.blender/.bfont.ttf branches/soc-2010-merwin/release/bin/.blender/locale/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/bg/ branches/soc-2010-merwin/release/bin/.blender/locale/bg/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ca/ branches/soc-2010-merwin/release/bin/.blender/locale/ca/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/cs/ branches/soc-2010-merwin/release/bin/.blender/locale/cs/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/de/ branches/soc-2010-merwin/release/bin/.blender/locale/de/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/el/ branches/soc-2010-merwin/release/bin/.blender/locale/el/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/es/ branches/soc-2010-merwin/release/bin/.blender/locale/es/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/fi/ branches/soc-2010-merwin/release/bin/.blender/locale/fi/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/fr/ branches/soc-2010-merwin/release/bin/.blender/locale/fr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/hr/ branches/soc-2010-merwin/release/bin/.blender/locale/hr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/ branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/it/ branches/soc-2010-merwin/release/bin/.blender/locale/it/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ja/ branches/soc-2010-merwin/release/bin/.blender/locale/ja/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ko/ branches/soc-2010-merwin/release/bin/.blender/locale/ko/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/nl/ branches/soc-2010-merwin/release/bin/.blender/locale/nl/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/pl/ branches/soc-2010-merwin/release/bin/.blender/locale/pl/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/ branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ro/ branches/soc-2010-merwin/release/bin/.blender/locale/ro/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ru/ branches/soc-2010-merwin/release/bin/.blender/locale/ru/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/sr/ branches/soc-2010-merwin/release/bin/.blender/locale/sr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/ branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/sv/ branches/soc-2010-merwin/release/bin/.blender/locale/sv/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/uk/ branches/soc-2010-merwin/release/bin/.blender/locale/uk/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/ branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/blender-thumbnailer.py branches/soc-2010-merwin/release/scripts/modules/bpy/path.py branches/soc-2010-merwin/release/windows/installer/01.installer.bmp Removed Paths: ------------- branches/soc-2010-merwin/bin/ branches/soc-2010-merwin/build_files/make/dlltool/Makefile branches/soc-2010-merwin/build_files/make/dlltool/gettext.def branches/soc-2010-merwin/build_files/make/dlltool/iconv.def branches/soc-2010-merwin/build_files/make/dlltool/python.def branches/soc-2010-merwin/dlltool/ branches/soc-2010-merwin/release/bin/.blender/ branches/soc-2010-merwin/release/bin/.blender/.Blanguages branches/soc-2010-merwin/release/bin/.blender/.bfont.ttf branches/soc-2010-merwin/release/bin/.blender/locale/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/bg/ branches/soc-2010-merwin/release/bin/.blender/locale/bg/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ca/ branches/soc-2010-merwin/release/bin/.blender/locale/ca/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/cs/ branches/soc-2010-merwin/release/bin/.blender/locale/cs/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/de/ branches/soc-2010-merwin/release/bin/.blender/locale/de/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/el/ branches/soc-2010-merwin/release/bin/.blender/locale/el/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/es/ branches/soc-2010-merwin/release/bin/.blender/locale/es/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/fi/ branches/soc-2010-merwin/release/bin/.blender/locale/fi/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/fr/ branches/soc-2010-merwin/release/bin/.blender/locale/fr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/hr/ branches/soc-2010-merwin/release/bin/.blender/locale/hr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/ branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/it/ branches/soc-2010-merwin/release/bin/.blender/locale/it/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ja/ branches/soc-2010-merwin/release/bin/.blender/locale/ja/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ko/ branches/soc-2010-merwin/release/bin/.blender/locale/ko/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/nl/ branches/soc-2010-merwin/release/bin/.blender/locale/nl/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/pl/ branches/soc-2010-merwin/release/bin/.blender/locale/pl/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/ branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ro/ branches/soc-2010-merwin/release/bin/.blender/locale/ro/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/ru/ branches/soc-2010-merwin/release/bin/.blender/locale/ru/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/sr/ branches/soc-2010-merwin/release/bin/.blender/locale/sr/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/ branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/s...@latn/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/sv/ branches/soc-2010-merwin/release/bin/.blender/locale/sv/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/uk/ branches/soc-2010-merwin/release/bin/.blender/locale/uk/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/ branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/LC_MESSAGES/ branches/soc-2010-merwin/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo branches/soc-2010-merwin/release/bin/blender-thumbnailer.py branches/soc-2010-merwin/release/scripts/io/engine_render_pov.py branches/soc-2010-merwin/release/scripts/ui/space_buttons.py branches/soc-2010-merwin/source/blender/editors/space_logic/logic_header.c branches/soc-2010-merwin/source/blender/makesdna/DNA_wave_types.h branches/soc-2010-merwin/source/gameengine/PyDoc/SConscript Property Changed: ---------------- branches/soc-2010-merwin/release/scripts/io/netrender/repath.py Modified: branches/soc-2010-merwin/CMakeLists.txt =================================================================== --- branches/soc-2010-merwin/CMakeLists.txt 2010-08-07 10:57:15 UTC (rev 31141) +++ branches/soc-2010-merwin/CMakeLists.txt 2010-08-07 12:51:51 UTC (rev 31142) @@ -69,7 +69,7 @@ OPTION(WITH_LCMS "Enable color correction with lcms" OFF) OPTION(WITH_PYTHON "Enable Embedded Python API" ON) OPTION(WITH_BUILDINFO "Include extra build details" ON) -OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) +OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON) OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF) OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) OPTION(WITH_GAMEENGINE "Enable Game Engine" ON) @@ -82,10 +82,12 @@ ENDIF() # Image format support -OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) -OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) -OPTION(WITH_TIFF "Enable LibTIFF Support" ON) -OPTION(WITH_DDS "Enable DDS Support" ON) +OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) +OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) +OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON) +OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON) +OPTION(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON) +OPTION(WITH_IMAGE_HDR "Enable HDR Image Support" ON) # Audio format support OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) @@ -115,6 +117,7 @@ OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF) OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON) +OPTION(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) IF(APPLE) OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) @@ -130,6 +133,10 @@ MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER) +IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) + MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL") +ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) + TEST_SSE_SUPPORT() # disabled for now, not supported @@ -215,7 +222,7 @@ ENDIF(NOT SDL_FOUND) ENDIF(WITH_SDL) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory") FIND_PATH(OPENEXR_INC ImfXdr.h @@ -230,16 +237,16 @@ SET(OPENEXR_LIB Half IlmImf Iex Imath) IF(NOT OPENEXR_INC) - SET(WITH_OPENEXR OFF) + SET(WITH_IMAGE_OPENEXR OFF) ENDIF(NOT OPENEXR_INC) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) FIND_PACKAGE(TIFF) IF(NOT TIFF_FOUND) - SET(WITH_TIFF OFF) + SET(WITH_IMAGE_TIFF OFF) ENDIF(NOT TIFF_FOUND) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) FIND_PACKAGE(JPEG REQUIRED) @@ -492,7 +499,7 @@ SET(FFMPEG_LIBPATH ${FFMPEG}/lib) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath) SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) @@ -504,14 +511,14 @@ IF (MSVC90) SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008) ENDIF(MSVC90) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/tiff) SET(TIFF_LIBRARY libtiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_JACK) SET(JACK ${LIBDIR}/jack) @@ -602,19 +609,19 @@ SET(FFMPEG_LIBPATH ${FFMPEG}/lib) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/gcc/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR) SET(OPENEXR_LIB Half IlmImf Imath IlmThread) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/gcc/tiff) SET(TIFF_LIBRARY tiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_JACK) SET(JACK ${LIBDIR}/jack) @@ -722,12 +729,12 @@ SET(FREETYPE_LIBPATH ${FREETYPE}/lib) SET(FREETYPE_LIBRARY freetype) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include) SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) SET(LCMS ${LIBDIR}/lcms) @@ -805,12 +812,12 @@ SET(JPEG_INC "${JPEG}/include") SET(JPEG_LIBPATH ${JPEG}/lib) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/tiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBRARY tiff) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") @@ -864,11 +871,11 @@ #----------------------------------------------------------------------------- # Common. -IF(WITH_OPENJPEG) +IF(WITH_IMAGE_OPENJPEG) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG_INC ${OPENJPEG}) set(OPENJPEG_LIb extern_libopenjpeg) -ENDIF(WITH_OPENJPEG) +ENDIF(WITH_IMAGE_OPENJPEG) #----------------------------------------------------------------------------- # Blender WebPlugin Modified: branches/soc-2010-merwin/Makefile =================================================================== --- branches/soc-2010-merwin/Makefile 2010-08-07 10:57:15 UTC (rev 31141) +++ branches/soc-2010-merwin/Makefile 2010-08-07 12:51:51 UTC (rev 31142) @@ -45,7 +45,7 @@ SOURCEDIR = ifeq ($(FREE_WINDOWS),true) - DIRS ?= dlltool extern intern source po + DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po else DIRS ?= extern intern source po endif Modified: branches/soc-2010-merwin/SConstruct =================================================================== --- branches/soc-2010-merwin/SConstruct 2010-08-07 10:57:15 UTC (rev 31141) +++ branches/soc-2010-merwin/SConstruct 2010-08-07 12:51:51 UTC (rev 31142) @@ -210,14 +210,36 @@ print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC, GetOption('num_jobs')) print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG']) -# BLENDERPATH is a unix only option to enable typical style paths this is -# spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR -# because the blender binary is installed in $BF_INSTALLDIR/bin/blender +if 'blenderlite' in B.targets: + target_env_defs = {} + target_env_defs['WITH_BF_GAMEENGINE'] = False + target_env_defs['WITH_BF_OPENAL'] = False + target_env_defs['WITH_BF_OPENEXR'] = False + target_env_defs['WITH_BF_OPENMP'] = False + target_env_defs['WITH_BF_ICONV'] = False + target_env_defs['WITH_BF_INTERNATIONAL'] = False + target_env_defs['WITH_BF_OPENJPEG'] = False + target_env_defs['WITH_BF_FFMPEG'] = False + target_env_defs['WITH_BF_QUICKTIME'] = False + target_env_defs['WITH_BF_REDCODE'] = False + target_env_defs['WITH_BF_DDS'] = False + target_env_defs['WITH_BF_CINEON'] = False + target_env_defs['WITH_BF_HDR'] = False + target_env_defs['WITH_BF_ZLIB'] = False + target_env_defs['WITH_BF_SDL'] = False + target_env_defs['WITH_BF_JPEG'] = False + target_env_defs['WITH_BF_PNG'] = False + target_env_defs['WITH_BF_BULLET'] = False + target_env_defs['WITH_BF_BINRELOC'] = False + target_env_defs['BF_BUILDINFO'] = False + target_env_defs['BF_NO_ELBEEM'] = True + target_env_defs['WITH_BF_PYTHON'] = False + + # Merge blenderlite, let command line to override + for k,v in target_env_defs.iteritems(): + if k not in B.arguments: + env[k] = v -if env['WITH_BF_FHS']: - BLENDERPATH = os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION']) -else: - BLENDERPATH = env['BF_INSTALLDIR'] if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): @@ -271,34 +293,6 @@ if 'blendernogame' in B.targets: env['WITH_BF_GAMEENGINE'] = False -if 'blenderlite' in B.targets: - target_env_defs = {} - target_env_defs['WITH_BF_GAMEENGINE'] = False - target_env_defs['WITH_BF_OPENAL'] = False - target_env_defs['WITH_BF_OPENEXR'] = False - target_env_defs['WITH_BF_OPENMP'] = False - target_env_defs['WITH_BF_ICONV'] = False - target_env_defs['WITH_BF_INTERNATIONAL'] = False - target_env_defs['WITH_BF_OPENJPEG'] = False - target_env_defs['WITH_BF_FFMPEG'] = False - target_env_defs['WITH_BF_QUICKTIME'] = False - target_env_defs['WITH_BF_REDCODE'] = False - target_env_defs['WITH_BF_DDS'] = False - target_env_defs['WITH_BF_ZLIB'] = False - target_env_defs['WITH_BF_SDL'] = False - target_env_defs['WITH_BF_JPEG'] = False - target_env_defs['WITH_BF_PNG'] = False - target_env_defs['WITH_BF_BULLET'] = False - target_env_defs['WITH_BF_BINRELOC'] = False - target_env_defs['BF_BUILDINFO'] = False - target_env_defs['BF_NO_ELBEEM'] = True - target_env_defs['WITH_BF_PYTHON'] = False - - # Merge blenderlite, let command line to override - for k,v in target_env_defs.iteritems(): - if k not in B.arguments: - env[k] = v - # disable elbeem (fluidsim) compilation? if env['BF_NO_ELBEEM'] == 1: env['CPPFLAGS'].append('-DDISABLE_ELBEEM') @@ -311,7 +305,7 @@ # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir B.root_build_dir = env['BF_BUILDDIR'] -B.doc_build_dir = os.path.join(BLENDERPATH, 'doc') +B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc') if not B.root_build_dir[-1]==os.sep: B.root_build_dir += os.sep if not B.doc_build_dir[-1]==os.sep: @@ -366,8 +360,9 @@ os.makedirs ( B.root_build_dir + 'extern' ) os.makedirs ( B.root_build_dir + 'lib' ) os.makedirs ( B.root_build_dir + 'bin' ) -if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']: - os.makedirs ( B.doc_build_dir ) +# # Docs not working with epy anymore +# if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']: @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs