[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27426] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 27420.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Thu Mar 11 21:04:25 CET 2010
Revision: 27426
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27426
Author: kjym3
Date: 2010-03-11 21:04:25 +0100 (Thu, 11 Mar 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 27420.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27420
Modified Paths:
--------------
branches/soc-2008-mxcurioni/COPYING
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/soc-2008-mxcurioni/intern/itasc/Armature.cpp
branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/smoke/intern/IMAGE.h
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/import_shape_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/copy.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/finger_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/stretch.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tail_control.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/track_dual.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/track_reverse.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
branches/soc-2008-mxcurioni/release/scripts/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_gl.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_fileselect.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/writeimage.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_thumbs.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/SConscript
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-mxcurioni/source/nan_compile.mk
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/scripts/presets/render/D16.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/D4.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/HDV_1080p.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/SXGA.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/WSXGA+.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/WSXGA.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/XGA.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/INSTALL
branches/soc-2008-mxcurioni/README
branches/soc-2008-mxcurioni/release/scripts/addons/
Property Changed:
----------------
branches/soc-2008-mxcurioni/release/scripts/
Modified: branches/soc-2008-mxcurioni/COPYING
===================================================================
--- branches/soc-2008-mxcurioni/COPYING 2010-03-11 19:33:00 UTC (rev 27425)
+++ branches/soc-2008-mxcurioni/COPYING 2010-03-11 20:04:25 UTC (rev 27426)
@@ -1,3 +1,11 @@
-Please read over both of the following files:
+Blender uses the GNU General Public License, which describes the rights
+to distribute or change the code.
+
+Please read this file for the full license.
doc/GPL-license.txt
-doc/BL-license.txt
+
+Apart from the GNU GPL, Blender is not available under other licenses.
+
+2010, Blender Foundation
+foundation at blender.org
+
Deleted: branches/soc-2008-mxcurioni/INSTALL
===================================================================
--- branches/soc-2008-mxcurioni/INSTALL 2010-03-11 19:33:00 UTC (rev 27425)
+++ branches/soc-2008-mxcurioni/INSTALL 2010-03-11 20:04:25 UTC (rev 27426)
@@ -1,370 +0,0 @@
-This file is to help you get started using the source and will hopefully
-answer most questions. If you do have any problems with these instructions,
-post a message to the Forums on www.blender.org, or visit us at #blendercoders
-on irc.freenode.net
-
-The build documentation is also available through the website:
-
-http://www.blender3d.org/cms/Building_Blender.117.0.html
-
-This should have the most up-to-date build documentation at all times.
-
-
-Here are some links to external packages you may or may not need:
-
-python: http://www.python.org
-libjpeg: http://www.ijg.org/
-libpng: http://www.libpng.org/pub/png/
-zlib: http://www.gzip.org/zlib/
-openal: http://www.openal.org/home/ (for linux/windows)
- http://kcat.strangesoft.net/openal.html
-sdl: http://www.libsdl.org
-
-mozilla: http://www.mozilla.org/
-nspr: ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases
- (side note: on debian linux you will need mozilla-dev and libnspr-dev)
-
-glut: http://www.opengl.org/developers/documentation/glut.html
-
-If you do not have OpenGL headers and libraries you will also need mesa:
-mesa: http://www.mesa3d.org
-
-If you want to compile with QuickTime enabled, download the SDK for your OS:
-quicktime: http://developer.apple.com/quicktime/
-
-For the translations to other languages than English you will need gettext.
-Note that these translations are not complete yet, some time after the
-release of 2.27 they will be made available for download also.
-We welcome feedback about the translated user interface, and even contributions
-to the translation effort :)
-
-gettext: http://www.gnu.org/software/gettext/
-
-
-
-*********************************************************************
-*********************************************************************
-
-There are three build systems for unixy platforms, the old NaN Makefiles
-and the brand new SCons-based system and CMake.
-
-The NaN system is best understood, if you want to use the configure system,
-please help improve it. SCons has been added as a new build system for
-Blender and it has expanded in a short time, proving to be a quite handy
-build system.
-
-*********************************************************************
-*********************************************************************
-
-
-
---------------Basic Makefile TIPS---------------------------------------
-
-
-First of all, make sure
-1) you have the full source tree available, either via SVN or as source download.
-2) you have the libs dir (SVNROOT/lib/ or bf-blender/lib/ ) checkout as well
-
-Read about that here;
-http://www.blender3d.org/cms/Building_Blender.117.0.html
-
-In bf-blender/blender/source you can find several .mk files, these are the
-main makefile templates, used all over the Makefiles in the source tree.
-
-Edit source/nan_definitions.mk to fit your environment, be sure to edit the
-block matching your OS. You will want to change variables like
-NAN_JPEG, NAN_PNG, NAN_PYTHON etc. to point to where you have those installed.
-
-Also check on source/Makefile, for potential conflicts with how you configured
-your system. In general this is not needed though.
-
-If you want to be able to run in 'make' in any subdirectory, you also need to
-set 2 environment variables;
-
-NANBLENDERHOME : should point to the bf-blender directory
-MAKEFLAGS: "-w -I$NANBLENDERHOME/source"
-
-After adjusting things for your environment you can run 'make' (or use the nice hmake
-script at blender/source/tools/hmake/hmake).
-
-1) run 'make' in bf-blender/intern/
-2) run 'make' in bf-blender/extern/
-3) run 'make' in bf-blender/source/
-
-The last step should result in the blender binary. But, first check the TIPS below
-for the specific OS's.
-
-NOTE 1:
-It is possible that compiling fails because a directory to save objects and libs to was
-never created before. These all go to bf-blender/obj/xxxxx/ , where xxxx stands for the
-'guessconfig' name of your OS/CPU configuration.
-You can run 'guessconfig' here: bf-blender/source/tools/guess/guessconfig
-
-NOTE 2:
-That same 'guessconfig' name is used to read from bf-blender/lib/
-Since that directory comes from svn, easiest is to create a symlink to that dir with the
-correct name.
-
-
-
-
-----------------------Basic SCons TIPS----------------------------------
-
-More documentation on the scons system is available at
-blender/doc/blender-scons.txt and blender/doc/blender-scons-dev.txt. Where
-this document and those conflict, those are much more likely to be right.
-
-To be able to build with the SCons build system you'll need Python (preferably
-version 2.4.x) and SCons (http://www.scons.org) installed. After you're
-sure these work properly you are ready to build with SCons.
-
-Systems supported at the moment are:
-* Linux (Ken )
-* Windows (jesterKing)
-* Irix (Hos)
-* Cygwin (Michel_)
-* MacOS (sgefant)
-
-All except Linux build with this system against the precompiled libraries,
-so be sure to get them from SVN, ie. for Windows:
-
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/lib/windows
-
-Be sure to do this at the same level your blender directory is at
-(ie. /home/username/build/blender and /home/username/build/lib/OS).
-
-Not all are entirely complete yet, but the system itself is very usable.
-
-Quick tip 1: type 'scons' to build it. (If you get errors edit config.opts
- so that it matches your system)
-Quick tip 2: type 'scons clean' to clean your build tree.
-Quick tip 3: You should also remove/rename user_config.py any time SConstruct
- has changed.
-
-The main file of interest is the SConstruct file in the blender
-directory. Open this file and browse to the section that concerns your
-system. Set any options as necessary (the true/false switches, the
-rest should work out-of-the-box).
-
-When you're satisfied with the settings you should run scons. For most systems
-that is just in the command-line in the directory containing the SConstruct
-file. If you want to, you can use the switch -j N for benefiting more processors,
-and --debug=time for timing the entire build process.
-
-If you are on Windows and you want to compile with MSVC (6 and 7) you'll need
-to run vcvars32.bat in your command-line (DOS-box) to set the necessary
-environment variables. Be sure to browse to the blender top-directory. Type
-'scons' and watch the build fly by.
-
-For the Windows build the QuickTime SDK is expected to be at
-lib\windows\QTDevWin\CIncludes
-and
-lib\windows\QTDevWin\Libraries,
-but you can alter the SConstruct file to point it to the path you have your
-QuickTime SDK installed.
-
-
-----------------------WINDOWS TIPS--------------------------------------
-
-When building Blender on Windows you have three choices:
-METHOD 1. Build using the old NaN Makefiles.
-METHOD 2. Use Microsoft Visual Studio project files (msvc6 and msvc7)
-METHOD 3. Use SCons (see above)
-
-These directions are for method 2. Method 1 was used in Nan in combination
-with Cygwin.
-
-If you are using Method 1 with cygwin you need to set FREE_WINDOWS
-to true you can do this with: export FREE_WINDOWS=true
-
-EXTERNAL LIBARIES
-All external libraries that Blender depends on are found in SVN in
-precompiled form. If you did not already do so, check out lib/windows from SVN using
-
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/lib/windows
-
-[NOTE: Make sure you are in the directory where the blender directory resides,
-NOT in the blender directory itself! lib/windows must be in the same dir as
-blender to make the VC project files work correctly.]
-If you prefer to build or download those libraries yourself, there are some
-directions below.
-
-INTERN LIBRARIES:
-The first thing you need to do is to build the Blender "intern" libraries.
-You need to have Python installed on your machine.
-
-Open the workspace in the $NANBLENDERHOME/intern/make/msvc_6_0 (msvc_7_0 if you
-want to build with .NET) directory.
-Build the "build_install_all" project. This will build all the intern libraries
-and installs them in the $NANBLENDERHOME/../lib/windows directory.
-
-If you get weird compiler errors, make sure you have the latest Visual Studio
-Service Pack installed. SP5 worked for me.
-
-If the post build step (copying the libraries to their destinations) fails,
-this is probably due to the fact that MSVC can't find the XCOPY command as
-happened to me on an XP system. MSVC has it's own PATH that you can set through
-the options. Open options from the menu: Tools->Options. Go to the directories
-tab and select "Executable files" from the drop down menu. Now add you SYSTEM32
-directory.
-
-The last project build is the python_freeze project that will freeze python code
-for compilation and linking with Blender's C code. At the moment, this should be
-automatic except that batch file probably does not find Python. If this is the
-case, follow the same procedure as was mentioned above for the XCOPY command
-to add Python to your path.
-
-BUILDING BLENDER
-
-Open the workspace $NANBLENDERHOME/projectfiles/blender/blender.dsw or the
-solution $NANBLENDERHOME/projectfiles_vc7/blender/blender.sln
-
-blender Builds the main executable
-
-Choose the project blender and hit F7. If all is well it should build
-with a lot of warnings but no errors.
-
-BUILDING/DOWNLOADING EXTERNAL LIBRARIES
-If you don't want to use the precompiled libraries you can download and/or
-build them yourself. Here are some directions.
-
-JPEG:
-BINARY LIBRARY:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list