[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14100] branches/ndof/source: resolved conflict state with HEAD r14096
JLuc Peuriere
jlp at nerim.net
Fri Mar 14 00:54:06 CET 2008
Revision: 14100
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14100
Author: lukep
Date: 2008-03-14 00:54:02 +0100 (Fri, 14 Mar 2008)
Log Message:
-----------
resolved conflict state with HEAD r14096
blenderbuttons still bad
not let this compile
Modified Paths:
--------------
branches/ndof/source/Makefile
branches/ndof/source/blender/Makefile
branches/ndof/source/blender/SConscript
branches/ndof/source/blender/avi/intern/avi.c
branches/ndof/source/blender/avi/intern/endian.c
branches/ndof/source/blender/avi/intern/options.c
branches/ndof/source/blender/blenkernel/BKE_DerivedMesh.h
branches/ndof/source/blender/blenkernel/BKE_action.h
branches/ndof/source/blender/blenkernel/BKE_anim.h
branches/ndof/source/blender/blenkernel/BKE_armature.h
branches/ndof/source/blender/blenkernel/BKE_bad_level_calls.h
branches/ndof/source/blender/blenkernel/BKE_blender.h
branches/ndof/source/blender/blenkernel/BKE_constraint.h
branches/ndof/source/blender/blenkernel/BKE_curve.h
branches/ndof/source/blender/blenkernel/BKE_customdata.h
branches/ndof/source/blender/blenkernel/BKE_deform.h
branches/ndof/source/blender/blenkernel/BKE_displist.h
branches/ndof/source/blender/blenkernel/BKE_global.h
branches/ndof/source/blender/blenkernel/BKE_group.h
branches/ndof/source/blender/blenkernel/BKE_icons.h
branches/ndof/source/blender/blenkernel/BKE_idprop.h
branches/ndof/source/blender/blenkernel/BKE_image.h
branches/ndof/source/blender/blenkernel/BKE_ipo.h
branches/ndof/source/blender/blenkernel/BKE_key.h
branches/ndof/source/blender/blenkernel/BKE_lattice.h
branches/ndof/source/blender/blenkernel/BKE_main.h
branches/ndof/source/blender/blenkernel/BKE_material.h
branches/ndof/source/blender/blenkernel/BKE_mball.h
branches/ndof/source/blender/blenkernel/BKE_mesh.h
branches/ndof/source/blender/blenkernel/BKE_modifier.h
branches/ndof/source/blender/blenkernel/BKE_node.h
branches/ndof/source/blender/blenkernel/BKE_object.h
branches/ndof/source/blender/blenkernel/BKE_scene.h
branches/ndof/source/blender/blenkernel/BKE_softbody.h
branches/ndof/source/blender/blenkernel/BKE_text.h
branches/ndof/source/blender/blenkernel/BKE_texture.h
branches/ndof/source/blender/blenkernel/BKE_utildefines.h
branches/ndof/source/blender/blenkernel/BKE_verse.h
branches/ndof/source/blender/blenkernel/CMakeLists.txt
branches/ndof/source/blender/blenkernel/SConscript
branches/ndof/source/blender/blenkernel/bad_level_call_stubs/Makefile
branches/ndof/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/ndof/source/blender/blenkernel/intern/CCGSubSurf.c
branches/ndof/source/blender/blenkernel/intern/DerivedMesh.c
branches/ndof/source/blender/blenkernel/intern/Makefile
branches/ndof/source/blender/blenkernel/intern/action.c
branches/ndof/source/blender/blenkernel/intern/anim.c
branches/ndof/source/blender/blenkernel/intern/armature.c
branches/ndof/source/blender/blenkernel/intern/blender.c
branches/ndof/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ndof/source/blender/blenkernel/intern/colortools.c
branches/ndof/source/blender/blenkernel/intern/constraint.c
branches/ndof/source/blender/blenkernel/intern/curve.c
branches/ndof/source/blender/blenkernel/intern/customdata.c
branches/ndof/source/blender/blenkernel/intern/deform.c
branches/ndof/source/blender/blenkernel/intern/depsgraph.c
branches/ndof/source/blender/blenkernel/intern/displist.c
branches/ndof/source/blender/blenkernel/intern/effect.c
branches/ndof/source/blender/blenkernel/intern/exotic.c
branches/ndof/source/blender/blenkernel/intern/group.c
branches/ndof/source/blender/blenkernel/intern/icons.c
branches/ndof/source/blender/blenkernel/intern/idprop.c
branches/ndof/source/blender/blenkernel/intern/image.c
branches/ndof/source/blender/blenkernel/intern/ipo.c
branches/ndof/source/blender/blenkernel/intern/key.c
branches/ndof/source/blender/blenkernel/intern/lattice.c
branches/ndof/source/blender/blenkernel/intern/library.c
branches/ndof/source/blender/blenkernel/intern/material.c
branches/ndof/source/blender/blenkernel/intern/mball.c
branches/ndof/source/blender/blenkernel/intern/mesh.c
branches/ndof/source/blender/blenkernel/intern/modifier.c
branches/ndof/source/blender/blenkernel/intern/node.c
branches/ndof/source/blender/blenkernel/intern/object.c
branches/ndof/source/blender/blenkernel/intern/sca.c
branches/ndof/source/blender/blenkernel/intern/scene.c
branches/ndof/source/blender/blenkernel/intern/script.c
branches/ndof/source/blender/blenkernel/intern/softbody.c
branches/ndof/source/blender/blenkernel/intern/subsurf_ccg.c
branches/ndof/source/blender/blenkernel/intern/text.c
branches/ndof/source/blender/blenkernel/intern/texture.c
branches/ndof/source/blender/blenkernel/intern/verse_geometry_node.c
branches/ndof/source/blender/blenkernel/intern/verse_node.c
branches/ndof/source/blender/blenkernel/intern/verse_object_node.c
branches/ndof/source/blender/blenkernel/intern/verse_session.c
branches/ndof/source/blender/blenkernel/intern/world.c
branches/ndof/source/blender/blenkernel/intern/writeavi.c
branches/ndof/source/blender/blenkernel/intern/writeffmpeg.c
branches/ndof/source/blender/blenlib/BLI_arithb.h
branches/ndof/source/blender/blenlib/BLI_blenlib.h
branches/ndof/source/blender/blenlib/BLI_boxpack2d.h
branches/ndof/source/blender/blenlib/BLI_editVert.h
branches/ndof/source/blender/blenlib/BLI_rand.h
branches/ndof/source/blender/blenlib/BLI_storage_types.h
branches/ndof/source/blender/blenlib/BLI_threads.h
branches/ndof/source/blender/blenlib/CMakeLists.txt
branches/ndof/source/blender/blenlib/SConscript
branches/ndof/source/blender/blenlib/intern/BLI_ghash.c
branches/ndof/source/blender/blenlib/intern/BLI_storage.h
branches/ndof/source/blender/blenlib/intern/Makefile
branches/ndof/source/blender/blenlib/intern/arithb.c
branches/ndof/source/blender/blenlib/intern/fileops.c
branches/ndof/source/blender/blenlib/intern/psfont.c
branches/ndof/source/blender/blenlib/intern/rand.c
branches/ndof/source/blender/blenlib/intern/storage.c
branches/ndof/source/blender/blenlib/intern/threads.c
branches/ndof/source/blender/blenlib/intern/util.c
branches/ndof/source/blender/blenloader/BLO_readfile.h
branches/ndof/source/blender/blenloader/intern/Makefile
branches/ndof/source/blender/blenloader/intern/readblenentry.c
branches/ndof/source/blender/blenloader/intern/readfile.c
branches/ndof/source/blender/blenloader/intern/readfile.h
branches/ndof/source/blender/blenloader/intern/writefile.c
branches/ndof/source/blender/blenpluginapi/iff.h
branches/ndof/source/blender/blenpluginapi/intern/Makefile
branches/ndof/source/blender/ftfont/CMakeLists.txt
branches/ndof/source/blender/ftfont/FTF_Api.h
branches/ndof/source/blender/ftfont/SConscript
branches/ndof/source/blender/ftfont/intern/FTF_Api.cpp
branches/ndof/source/blender/ftfont/intern/FTF_TTFont.cpp
branches/ndof/source/blender/ftfont/intern/FTF_TTFont.h
branches/ndof/source/blender/ftfont/intern/Makefile
branches/ndof/source/blender/imbuf/IMB_imbuf.h
branches/ndof/source/blender/imbuf/IMB_imbuf_types.h
branches/ndof/source/blender/imbuf/SConscript
branches/ndof/source/blender/imbuf/intern/IMB_anim.h
branches/ndof/source/blender/imbuf/intern/IMB_jpeg.h
branches/ndof/source/blender/imbuf/intern/Makefile
branches/ndof/source/blender/imbuf/intern/allocimbuf.c
branches/ndof/source/blender/imbuf/intern/anim.c
branches/ndof/source/blender/imbuf/intern/cineon/Makefile
branches/ndof/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/ndof/source/blender/imbuf/intern/cineon/cineonlib.c
branches/ndof/source/blender/imbuf/intern/cineon/dpxlib.c
branches/ndof/source/blender/imbuf/intern/cineon/logImageCore.c
branches/ndof/source/blender/imbuf/intern/cineon/logImageCore.h
branches/ndof/source/blender/imbuf/intern/cineon/logImageLib.c
branches/ndof/source/blender/imbuf/intern/cineon/logImageLib.h
branches/ndof/source/blender/imbuf/intern/divers.c
branches/ndof/source/blender/imbuf/intern/dynlibtiff.c
branches/ndof/source/blender/imbuf/intern/filter.c
branches/ndof/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/ndof/source/blender/imbuf/intern/imageprocess.c
branches/ndof/source/blender/imbuf/intern/jpeg.c
branches/ndof/source/blender/imbuf/intern/openexr/Makefile
branches/ndof/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/ndof/source/blender/imbuf/intern/openexr/openexr_multi.h
branches/ndof/source/blender/imbuf/intern/png.c
branches/ndof/source/blender/imbuf/intern/radiance_hdr.c
branches/ndof/source/blender/imbuf/intern/readimage.c
branches/ndof/source/blender/imbuf/intern/rectop.c
branches/ndof/source/blender/imbuf/intern/rotate.c
branches/ndof/source/blender/imbuf/intern/scaling.c
branches/ndof/source/blender/imbuf/intern/tiff.c
branches/ndof/source/blender/imbuf/intern/util.c
branches/ndof/source/blender/imbuf/intern/writeimage.c
branches/ndof/source/blender/include/BDR_drawaction.h
branches/ndof/source/blender/include/BDR_drawmesh.h
branches/ndof/source/blender/include/BDR_editcurve.h
branches/ndof/source/blender/include/BDR_editface.h
branches/ndof/source/blender/include/BDR_editmball.h
branches/ndof/source/blender/include/BDR_editobject.h
branches/ndof/source/blender/include/BDR_sculptmode.h
branches/ndof/source/blender/include/BDR_unwrapper.h
branches/ndof/source/blender/include/BIF_butspace.h
branches/ndof/source/blender/include/BIF_drawimage.h
branches/ndof/source/blender/include/BIF_drawseq.h
branches/ndof/source/blender/include/BIF_drawtext.h
branches/ndof/source/blender/include/BIF_editaction.h
branches/ndof/source/blender/include/BIF_editarmature.h
branches/ndof/source/blender/include/BIF_editconstraint.h
branches/ndof/source/blender/include/BIF_editdeform.h
branches/ndof/source/blender/include/BIF_editmesh.h
branches/ndof/source/blender/include/BIF_editmode_undo.h
branches/ndof/source/blender/include/BIF_editseq.h
branches/ndof/source/blender/include/BIF_editsima.h
branches/ndof/source/blender/include/BIF_editsound.h
branches/ndof/source/blender/include/BIF_editview.h
branches/ndof/source/blender/include/BIF_fsmenu.h
branches/ndof/source/blender/include/BIF_gl.h
branches/ndof/source/blender/include/BIF_imasel.h
branches/ndof/source/blender/include/BIF_interface.h
branches/ndof/source/blender/include/BIF_interface_icons.h
branches/ndof/source/blender/include/BIF_language.h
branches/ndof/source/blender/include/BIF_meshtools.h
branches/ndof/source/blender/include/BIF_outliner.h
branches/ndof/source/blender/include/BIF_poseobject.h
branches/ndof/source/blender/include/BIF_renderwin.h
branches/ndof/source/blender/include/BIF_resources.h
branches/ndof/source/blender/include/BIF_space.h
branches/ndof/source/blender/include/BIF_spacetypes.h
branches/ndof/source/blender/include/BIF_toolbox.h
branches/ndof/source/blender/include/BIF_transform.h
branches/ndof/source/blender/include/BIF_usiblender.h
branches/ndof/source/blender/include/BSE_drawimasel.h
branches/ndof/source/blender/include/BSE_drawipo.h
branches/ndof/source/blender/include/BSE_drawview.h
branches/ndof/source/blender/include/BSE_edit.h
branches/ndof/source/blender/include/BSE_editipo.h
branches/ndof/source/blender/include/BSE_filesel.h
branches/ndof/source/blender/include/BSE_headerbuttons.h
branches/ndof/source/blender/include/BSE_node.h
branches/ndof/source/blender/include/BSE_seqeffects.h
branches/ndof/source/blender/include/BSE_seqscopes.h
branches/ndof/source/blender/include/BSE_sequence.h
branches/ndof/source/blender/include/BSE_time.h
branches/ndof/source/blender/include/BSE_trans_types.h
branches/ndof/source/blender/include/BSE_view.h
branches/ndof/source/blender/include/blendef.h
branches/ndof/source/blender/include/butspace.h
branches/ndof/source/blender/include/datatoc.h
branches/ndof/source/blender/include/editmesh.h
branches/ndof/source/blender/include/interface.h
branches/ndof/source/blender/include/multires.h
branches/ndof/source/blender/include/mydevice.h
branches/ndof/source/blender/include/transform.h
branches/ndof/source/blender/makesdna/DNA_ID.h
branches/ndof/source/blender/makesdna/DNA_action_types.h
branches/ndof/source/blender/makesdna/DNA_actuator_types.h
branches/ndof/source/blender/makesdna/DNA_armature_types.h
branches/ndof/source/blender/makesdna/DNA_camera_types.h
branches/ndof/source/blender/makesdna/DNA_color_types.h
branches/ndof/source/blender/makesdna/DNA_constraint_types.h
branches/ndof/source/blender/makesdna/DNA_curve_types.h
branches/ndof/source/blender/makesdna/DNA_customdata_types.h
branches/ndof/source/blender/makesdna/DNA_group_types.h
branches/ndof/source/blender/makesdna/DNA_image_types.h
branches/ndof/source/blender/makesdna/DNA_ipo_types.h
branches/ndof/source/blender/makesdna/DNA_key_types.h
branches/ndof/source/blender/makesdna/DNA_lamp_types.h
branches/ndof/source/blender/makesdna/DNA_listBase.h
branches/ndof/source/blender/makesdna/DNA_material_types.h
branches/ndof/source/blender/makesdna/DNA_mesh_types.h
branches/ndof/source/blender/makesdna/DNA_meshdata_types.h
branches/ndof/source/blender/makesdna/DNA_modifier_types.h
branches/ndof/source/blender/makesdna/DNA_nla_types.h
branches/ndof/source/blender/makesdna/DNA_node_types.h
branches/ndof/source/blender/makesdna/DNA_object_force.h
branches/ndof/source/blender/makesdna/DNA_object_types.h
branches/ndof/source/blender/makesdna/DNA_scene_types.h
branches/ndof/source/blender/makesdna/DNA_screen_types.h
branches/ndof/source/blender/makesdna/DNA_scriptlink_types.h
branches/ndof/source/blender/makesdna/DNA_sequence_types.h
branches/ndof/source/blender/makesdna/DNA_space_types.h
branches/ndof/source/blender/makesdna/DNA_texture_types.h
branches/ndof/source/blender/makesdna/DNA_userdef_types.h
branches/ndof/source/blender/makesdna/DNA_view2d_types.h
branches/ndof/source/blender/makesdna/DNA_view3d_types.h
branches/ndof/source/blender/makesdna/DNA_world_types.h
branches/ndof/source/blender/makesdna/intern/Makefile
branches/ndof/source/blender/makesdna/intern/SConscript
branches/ndof/source/blender/makesdna/intern/makesdna.c
branches/ndof/source/blender/nodes/CMP_node.h
branches/ndof/source/blender/nodes/CMakeLists.txt
branches/ndof/source/blender/nodes/SConscript
branches/ndof/source/blender/nodes/SHD_node.h
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/Makefile
branches/ndof/source/blender/nodes/intern/CMP_util.c
branches/ndof/source/blender/nodes/intern/CMP_util.h
branches/ndof/source/blender/nodes/intern/Makefile
branches/ndof/source/blender/nodes/intern/SHD_nodes/Makefile
branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/ndof/source/blender/python/BPY_extern.h
branches/ndof/source/blender/python/BPY_interface.c
branches/ndof/source/blender/python/BPY_menus.c
branches/ndof/source/blender/python/SConscript
branches/ndof/source/blender/python/api2_2x/Armature.c
branches/ndof/source/blender/python/api2_2x/BGL.c
branches/ndof/source/blender/python/api2_2x/BezTriple.c
branches/ndof/source/blender/python/api2_2x/Blender.c
branches/ndof/source/blender/python/api2_2x/Bone.c
branches/ndof/source/blender/python/api2_2x/Bone.h
branches/ndof/source/blender/python/api2_2x/Camera.c
branches/ndof/source/blender/python/api2_2x/Constraint.c
branches/ndof/source/blender/python/api2_2x/CurNurb.c
branches/ndof/source/blender/python/api2_2x/Curve.c
branches/ndof/source/blender/python/api2_2x/Draw.c
branches/ndof/source/blender/python/api2_2x/Draw.h
branches/ndof/source/blender/python/api2_2x/Effect.c
branches/ndof/source/blender/python/api2_2x/Font.c
branches/ndof/source/blender/python/api2_2x/Geometry.c
branches/ndof/source/blender/python/api2_2x/Group.c
branches/ndof/source/blender/python/api2_2x/IDProp.c
branches/ndof/source/blender/python/api2_2x/Image.c
branches/ndof/source/blender/python/api2_2x/Ipo.c
branches/ndof/source/blender/python/api2_2x/Ipocurve.c
branches/ndof/source/blender/python/api2_2x/Ipocurve.h
branches/ndof/source/blender/python/api2_2x/Key.c
branches/ndof/source/blender/python/api2_2x/Lamp.c
branches/ndof/source/blender/python/api2_2x/Lattice.c
branches/ndof/source/blender/python/api2_2x/Library.c
branches/ndof/source/blender/python/api2_2x/Makefile
branches/ndof/source/blender/python/api2_2x/Material.c
branches/ndof/source/blender/python/api2_2x/Mathutils.c
branches/ndof/source/blender/python/api2_2x/Mathutils.h
branches/ndof/source/blender/python/api2_2x/Mesh.c
branches/ndof/source/blender/python/api2_2x/Metaball.c
branches/ndof/source/blender/python/api2_2x/Modifier.c
branches/ndof/source/blender/python/api2_2x/NLA.c
branches/ndof/source/blender/python/api2_2x/NMesh.c
branches/ndof/source/blender/python/api2_2x/Node.c
branches/ndof/source/blender/python/api2_2x/Node.h
branches/ndof/source/blender/python/api2_2x/Noise.c
branches/ndof/source/blender/python/api2_2x/Object.c
branches/ndof/source/blender/python/api2_2x/Pose.c
branches/ndof/source/blender/python/api2_2x/Scene.c
branches/ndof/source/blender/python/api2_2x/Sound.c
branches/ndof/source/blender/python/api2_2x/SurfNurb.c
branches/ndof/source/blender/python/api2_2x/Sys.c
branches/ndof/source/blender/python/api2_2x/Text.c
branches/ndof/source/blender/python/api2_2x/Text3d.c
branches/ndof/source/blender/python/api2_2x/Texture.c
branches/ndof/source/blender/python/api2_2x/Types.c
branches/ndof/source/blender/python/api2_2x/Window.c
branches/ndof/source/blender/python/api2_2x/World.c
branches/ndof/source/blender/python/api2_2x/bpy_config.c
branches/ndof/source/blender/python/api2_2x/bpy_data.c
branches/ndof/source/blender/python/api2_2x/doc/Armature.py
branches/ndof/source/blender/python/api2_2x/doc/BGL.py
branches/ndof/source/blender/python/api2_2x/doc/Blender.py
branches/ndof/source/blender/python/api2_2x/doc/Constraint.py
branches/ndof/source/blender/python/api2_2x/doc/Curve.py
branches/ndof/source/blender/python/api2_2x/doc/Draw.py
branches/ndof/source/blender/python/api2_2x/doc/Font.py
branches/ndof/source/blender/python/api2_2x/doc/Geometry.py
branches/ndof/source/blender/python/api2_2x/doc/Group.py
branches/ndof/source/blender/python/api2_2x/doc/Image.py
branches/ndof/source/blender/python/api2_2x/doc/Ipo.py
branches/ndof/source/blender/python/api2_2x/doc/Key.py
branches/ndof/source/blender/python/api2_2x/doc/Lamp.py
branches/ndof/source/blender/python/api2_2x/doc/LibData.py
branches/ndof/source/blender/python/api2_2x/doc/Material.py
branches/ndof/source/blender/python/api2_2x/doc/Mathutils.py
branches/ndof/source/blender/python/api2_2x/doc/Mesh.py
branches/ndof/source/blender/python/api2_2x/doc/Modifier.py
branches/ndof/source/blender/python/api2_2x/doc/NLA.py
branches/ndof/source/blender/python/api2_2x/doc/Object.py
branches/ndof/source/blender/python/api2_2x/doc/Pose.py
branches/ndof/source/blender/python/api2_2x/doc/Render.py
branches/ndof/source/blender/python/api2_2x/doc/Scene.py
branches/ndof/source/blender/python/api2_2x/doc/Text3d.py
branches/ndof/source/blender/python/api2_2x/doc/Texture.py
branches/ndof/source/blender/python/api2_2x/doc/Window.py
branches/ndof/source/blender/python/api2_2x/euler.c
branches/ndof/source/blender/python/api2_2x/gen_library.c
branches/ndof/source/blender/python/api2_2x/gen_library.h
branches/ndof/source/blender/python/api2_2x/gen_utils.c
branches/ndof/source/blender/python/api2_2x/gen_utils.h
branches/ndof/source/blender/python/api2_2x/logic.c
branches/ndof/source/blender/python/api2_2x/matrix.c
branches/ndof/source/blender/python/api2_2x/quat.c
branches/ndof/source/blender/python/api2_2x/rgbTuple.c
branches/ndof/source/blender/python/api2_2x/sceneRender.c
branches/ndof/source/blender/python/api2_2x/sceneRender.h
branches/ndof/source/blender/python/api2_2x/sceneSequence.c
branches/ndof/source/blender/python/api2_2x/sceneSequence.h
branches/ndof/source/blender/python/api2_2x/vector.c
branches/ndof/source/blender/python/api2_2x/windowTheme.c
branches/ndof/source/blender/quicktime/apple/quicktime_export.c
branches/ndof/source/blender/quicktime/apple/quicktime_import.c
branches/ndof/source/blender/radiosity/intern/source/Makefile
branches/ndof/source/blender/radiosity/intern/source/radfactors.c
branches/ndof/source/blender/radiosity/intern/source/radrender.c
branches/ndof/source/blender/readblenfile/intern/Makefile
branches/ndof/source/blender/readblenfile/stub/Makefile
branches/ndof/source/blender/readblenfile/test/Makefile
branches/ndof/source/blender/render/extern/include/RE_pipeline.h
branches/ndof/source/blender/render/extern/include/RE_render_ext.h
branches/ndof/source/blender/render/extern/include/RE_shader_ext.h
branches/ndof/source/blender/render/intern/include/pixelblending.h
branches/ndof/source/blender/render/intern/include/render_types.h
branches/ndof/source/blender/render/intern/include/rendercore.h
branches/ndof/source/blender/render/intern/include/renderdatabase.h
branches/ndof/source/blender/render/intern/include/shadbuf.h
branches/ndof/source/blender/render/intern/include/shading.h
branches/ndof/source/blender/render/intern/include/zbuf.h
branches/ndof/source/blender/render/intern/source/Makefile
branches/ndof/source/blender/render/intern/source/convertblender.c
branches/ndof/source/blender/render/intern/source/envmap.c
branches/ndof/source/blender/render/intern/source/imagetexture.c
branches/ndof/source/blender/render/intern/source/initrender.c
branches/ndof/source/blender/render/intern/source/pipeline.c
branches/ndof/source/blender/render/intern/source/pixelblending.c
branches/ndof/source/blender/render/intern/source/pixelshading.c
branches/ndof/source/blender/render/intern/source/rendercore.c
branches/ndof/source/blender/render/intern/source/renderdatabase.c
branches/ndof/source/blender/render/intern/source/shadbuf.c
branches/ndof/source/blender/render/intern/source/shadeinput.c
branches/ndof/source/blender/render/intern/source/shadeoutput.c
branches/ndof/source/blender/render/intern/source/sss.c
branches/ndof/source/blender/render/intern/source/texture.c
branches/ndof/source/blender/render/intern/source/zbuf.c
branches/ndof/source/blender/src/CMakeLists.txt
branches/ndof/source/blender/src/Makefile
branches/ndof/source/blender/src/SConscript
branches/ndof/source/blender/src/blenderbuttons.c
branches/ndof/source/blender/src/booleanops.c
branches/ndof/source/blender/src/butspace.c
branches/ndof/source/blender/src/buttons_editing.c
branches/ndof/source/blender/src/buttons_logic.c
branches/ndof/source/blender/src/buttons_object.c
branches/ndof/source/blender/src/buttons_scene.c
branches/ndof/source/blender/src/buttons_script.c
branches/ndof/source/blender/src/buttons_shading.c
branches/ndof/source/blender/src/drawaction.c
branches/ndof/source/blender/src/drawarmature.c
branches/ndof/source/blender/src/drawimage.c
branches/ndof/source/blender/src/drawimasel.c
branches/ndof/source/blender/src/drawipo.c
branches/ndof/source/blender/src/drawmesh.c
branches/ndof/source/blender/src/drawnla.c
branches/ndof/source/blender/src/drawnode.c
branches/ndof/source/blender/src/drawobject.c
branches/ndof/source/blender/src/drawoops.c
branches/ndof/source/blender/src/drawscene.c
branches/ndof/source/blender/src/drawscript.c
branches/ndof/source/blender/src/drawseq.c
branches/ndof/source/blender/src/drawsound.c
branches/ndof/source/blender/src/drawtext.c
branches/ndof/source/blender/src/drawtime.c
branches/ndof/source/blender/src/drawview.c
branches/ndof/source/blender/src/edit.c
branches/ndof/source/blender/src/editaction.c
branches/ndof/source/blender/src/editarmature.c
branches/ndof/source/blender/src/editconstraint.c
branches/ndof/source/blender/src/editcurve.c
branches/ndof/source/blender/src/editdeform.c
branches/ndof/source/blender/src/editface.c
branches/ndof/source/blender/src/editfont.c
branches/ndof/source/blender/src/editgroup.c
branches/ndof/source/blender/src/editimasel.c
branches/ndof/source/blender/src/editipo.c
branches/ndof/source/blender/src/editipo_lib.c
branches/ndof/source/blender/src/editipo_mods.c
branches/ndof/source/blender/src/editkey.c
branches/ndof/source/blender/src/editlattice.c
branches/ndof/source/blender/src/editmball.c
branches/ndof/source/blender/src/editmesh.c
branches/ndof/source/blender/src/editmesh_add.c
branches/ndof/source/blender/src/editmesh_lib.c
branches/ndof/source/blender/src/editmesh_loop.c
branches/ndof/source/blender/src/editmesh_mods.c
branches/ndof/source/blender/src/editmesh_tools.c
branches/ndof/source/blender/src/editmode_undo.c
branches/ndof/source/blender/src/editnla.c
branches/ndof/source/blender/src/editnode.c
branches/ndof/source/blender/src/editobject.c
branches/ndof/source/blender/src/editscreen.c
branches/ndof/source/blender/src/editseq.c
branches/ndof/source/blender/src/editsima.c
branches/ndof/source/blender/src/editsound.c
branches/ndof/source/blender/src/edittime.c
branches/ndof/source/blender/src/editview.c
branches/ndof/source/blender/src/filesel.c
branches/ndof/source/blender/src/fluidsim.c
branches/ndof/source/blender/src/ghostwinlay.c
branches/ndof/source/blender/src/glutil.c
branches/ndof/source/blender/src/hddaudio.c
branches/ndof/source/blender/src/header_action.c
branches/ndof/source/blender/src/header_buttonswin.c
branches/ndof/source/blender/src/header_filesel.c
branches/ndof/source/blender/src/header_image.c
branches/ndof/source/blender/src/header_imasel.c
branches/ndof/source/blender/src/header_info.c
branches/ndof/source/blender/src/header_ipo.c
branches/ndof/source/blender/src/header_nla.c
branches/ndof/source/blender/src/header_node.c
branches/ndof/source/blender/src/header_oops.c
branches/ndof/source/blender/src/header_script.c
branches/ndof/source/blender/src/header_seq.c
branches/ndof/source/blender/src/header_sound.c
branches/ndof/source/blender/src/header_text.c
branches/ndof/source/blender/src/header_time.c
branches/ndof/source/blender/src/header_view3d.c
branches/ndof/source/blender/src/headerbuttons.c
branches/ndof/source/blender/src/imagepaint.c
branches/ndof/source/blender/src/imasel.c
branches/ndof/source/blender/src/interface.c
branches/ndof/source/blender/src/interface_draw.c
branches/ndof/source/blender/src/interface_icons.c
branches/ndof/source/blender/src/interface_panel.c
branches/ndof/source/blender/src/language.c
branches/ndof/source/blender/src/meshtools.c
branches/ndof/source/blender/src/multires.c
branches/ndof/source/blender/src/oops.c
branches/ndof/source/blender/src/outliner.c
branches/ndof/source/blender/src/parametrizer.c
branches/ndof/source/blender/src/parametrizer.h
branches/ndof/source/blender/src/playanim.c
branches/ndof/source/blender/src/poseobject.c
branches/ndof/source/blender/src/preview.blend.c
branches/ndof/source/blender/src/previewrender.c
branches/ndof/source/blender/src/renderwin.c
branches/ndof/source/blender/src/resources.c
branches/ndof/source/blender/src/retopo.c
branches/ndof/source/blender/src/sculptmode.c
branches/ndof/source/blender/src/seqaudio.c
branches/ndof/source/blender/src/seqeffects.c
branches/ndof/source/blender/src/seqscopes.c
branches/ndof/source/blender/src/sequence.c
branches/ndof/source/blender/src/space.c
branches/ndof/source/blender/src/spacetypes.c
branches/ndof/source/blender/src/splash.jpg.c
branches/ndof/source/blender/src/toets.c
branches/ndof/source/blender/src/toolbox.c
branches/ndof/source/blender/src/transform.c
branches/ndof/source/blender/src/transform_constraints.c
branches/ndof/source/blender/src/transform_conversions.c
branches/ndof/source/blender/src/transform_generics.c
branches/ndof/source/blender/src/transform_manipulator.c
branches/ndof/source/blender/src/transform_snap.c
branches/ndof/source/blender/src/unwrapper.c
branches/ndof/source/blender/src/usiblender.c
branches/ndof/source/blender/src/verse_mesh.c
branches/ndof/source/blender/src/verse_object.c
branches/ndof/source/blender/src/view.c
branches/ndof/source/blender/src/vpaint.c
branches/ndof/source/blender/src/winlay.h
branches/ndof/source/blender/src/writeimage.c
branches/ndof/source/blender/verify/intern/Makefile
branches/ndof/source/blender/yafray/YafRay_Api.h
branches/ndof/source/blender/yafray/intern/Makefile
branches/ndof/source/blender/yafray/intern/api.cpp
branches/ndof/source/blender/yafray/intern/export_File.cpp
branches/ndof/source/blender/yafray/intern/export_File.h
branches/ndof/source/blender/yafray/intern/export_Plugin.cpp
branches/ndof/source/blender/yafray/intern/export_Plugin.h
branches/ndof/source/blender/yafray/intern/yafray_Render.cpp
branches/ndof/source/blender/yafray/intern/yafray_Render.h
branches/ndof/source/creator/CMakeLists.txt
branches/ndof/source/creator/Makefile
branches/ndof/source/creator/SConscript
branches/ndof/source/creator/buildinfo.c
branches/ndof/source/creator/creator.c
branches/ndof/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ndof/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/ndof/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/ndof/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/ndof/source/gameengine/Converter/BL_ActionActuator.cpp
branches/ndof/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ndof/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/ndof/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/ndof/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/ndof/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ndof/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/ndof/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/ndof/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/ndof/source/gameengine/Converter/KX_IpoConvert.cpp
branches/ndof/source/gameengine/Expressions/Expression.cpp
branches/ndof/source/gameengine/Expressions/Value.cpp
branches/ndof/source/gameengine/GameLogic/CMakeLists.txt
branches/ndof/source/gameengine/GameLogic/Makefile
branches/ndof/source/gameengine/GameLogic/SCA_IObject.cpp
branches/ndof/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/ndof/source/gameengine/GameLogic/SCA_ISensor.h
branches/ndof/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/ndof/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/ndof/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/ndof/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/ndof/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/ndof/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/ndof/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/ndof/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/ndof/source/gameengine/GameLogic/SConscript
branches/ndof/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
branches/ndof/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/ndof/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/ndof/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/ndof/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ndof/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/ndof/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/ndof/source/gameengine/Ketsji/BL_Shader.cpp
branches/ndof/source/gameengine/Ketsji/BL_Texture.cpp
branches/ndof/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/ndof/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/ndof/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/ndof/source/gameengine/Ketsji/KX_Camera.cpp
branches/ndof/source/gameengine/Ketsji/KX_Camera.h
branches/ndof/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/ndof/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ndof/source/gameengine/Ketsji/KX_GameObject.h
branches/ndof/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/ndof/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/ndof/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/ndof/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/ndof/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ndof/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ndof/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/ndof/source/gameengine/Ketsji/KX_NearSensor.h
branches/ndof/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ndof/source/gameengine/Ketsji/KX_PythonInit.h
branches/ndof/source/gameengine/Ketsji/KX_RayCast.cpp
branches/ndof/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/ndof/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/ndof/source/gameengine/Ketsji/KX_Scene.cpp
branches/ndof/source/gameengine/Ketsji/KX_Scene.h
branches/ndof/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/ndof/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/ndof/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/ndof/source/gameengine/Ketsji/KX_TouchSensor.h
branches/ndof/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/ndof/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ndof/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/ndof/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/ndof/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/ndof/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/ndof/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/ndof/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/ndof/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/ndof/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/ndof/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/ndof/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ndof/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/ndof/source/gameengine/SceneGraph/SG_IObject.cpp
branches/ndof/source/gameengine/SceneGraph/SG_Node.h
branches/ndof/source/kernel/gen_messaging/intern/Makefile
branches/ndof/source/nan_compile.mk
branches/ndof/source/nan_definitions.mk
branches/ndof/source/nan_link.mk
branches/ndof/source/tools/guess/guessconfig
Added Paths:
-----------
branches/ndof/source/blender/blenkernel/BKE_bmesh.h
branches/ndof/source/blender/blenkernel/BKE_cloth.h
branches/ndof/source/blender/blenkernel/BKE_collision.h
branches/ndof/source/blender/blenkernel/BKE_multires.h
branches/ndof/source/blender/blenkernel/BKE_particle.h
branches/ndof/source/blender/blenkernel/BKE_pointcache.h
branches/ndof/source/blender/blenkernel/BKE_sculpt.h
branches/ndof/source/blender/blenkernel/intern/BME_conversions.c
branches/ndof/source/blender/blenkernel/intern/BME_eulers.c
branches/ndof/source/blender/blenkernel/intern/BME_mesh.c
branches/ndof/source/blender/blenkernel/intern/BME_structure.c
branches/ndof/source/blender/blenkernel/intern/BME_tools.c
branches/ndof/source/blender/blenkernel/intern/bmesh_private.h
branches/ndof/source/blender/blenkernel/intern/cloth.c
branches/ndof/source/blender/blenkernel/intern/collision.c
branches/ndof/source/blender/blenkernel/intern/implicit.c
branches/ndof/source/blender/blenkernel/intern/kdop.c
branches/ndof/source/blender/blenkernel/intern/multires-firstlevel.c
branches/ndof/source/blender/blenkernel/intern/multires.c
branches/ndof/source/blender/blenkernel/intern/particle.c
branches/ndof/source/blender/blenkernel/intern/particle_system.c
branches/ndof/source/blender/blenkernel/intern/pointcache.c
branches/ndof/source/blender/blenkernel/intern/verse_method.c
branches/ndof/source/blender/blenlib/BLI_bpath.h
branches/ndof/source/blender/blenlib/BLI_fnmatch.h
branches/ndof/source/blender/blenlib/BLI_kdtree.h
branches/ndof/source/blender/blenlib/intern/BLI_kdtree.c
branches/ndof/source/blender/blenlib/intern/bpath.c
branches/ndof/source/blender/blenlib/intern/fnmatch.c
branches/ndof/source/blender/imbuf/IMB_thumbs.h
branches/ndof/source/blender/imbuf/intern/IMB_imginfo.h
branches/ndof/source/blender/imbuf/intern/dds/
branches/ndof/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/ndof/source/blender/imbuf/intern/dds/BlockDXT.h
branches/ndof/source/blender/imbuf/intern/dds/Color.h
branches/ndof/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/ndof/source/blender/imbuf/intern/dds/ColorBlock.h
branches/ndof/source/blender/imbuf/intern/dds/Common.h
branches/ndof/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/ndof/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/ndof/source/blender/imbuf/intern/dds/Image.cpp
branches/ndof/source/blender/imbuf/intern/dds/Image.h
branches/ndof/source/blender/imbuf/intern/dds/Makefile
branches/ndof/source/blender/imbuf/intern/dds/PixelFormat.h
branches/ndof/source/blender/imbuf/intern/dds/SConscript
branches/ndof/source/blender/imbuf/intern/dds/Stream.cpp
branches/ndof/source/blender/imbuf/intern/dds/Stream.h
branches/ndof/source/blender/imbuf/intern/dds/dds_api.cpp
branches/ndof/source/blender/imbuf/intern/dds/dds_api.h
branches/ndof/source/blender/imbuf/intern/imginfo.c
branches/ndof/source/blender/imbuf/intern/md5.c
branches/ndof/source/blender/imbuf/intern/md5.h
branches/ndof/source/blender/imbuf/intern/thumbs.c
branches/ndof/source/blender/include/BIF_editparticle.h
branches/ndof/source/blender/include/BIF_filelist.h
branches/ndof/source/blender/include/BIF_meshlaplacian.h
branches/ndof/source/blender/include/BIF_poselib.h
branches/ndof/source/blender/include/BIF_radialcontrol.h
branches/ndof/source/blender/include/BSE_editaction_types.h
branches/ndof/source/blender/include/reeb.h
branches/ndof/source/blender/makesdna/DNA_cloth_types.h
branches/ndof/source/blender/makesdna/DNA_particle_types.h
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/ndof/source/blender/python/api2_2x/doc/epy_docgen-3.sh
branches/ndof/source/blender/render/extern/include/RE_raytrace.h
branches/ndof/source/blender/render/intern/include/occlusion.h
branches/ndof/source/blender/render/intern/include/strand.h
branches/ndof/source/blender/render/intern/source/occlusion.c
branches/ndof/source/blender/render/intern/source/rayshade.c
branches/ndof/source/blender/render/intern/source/raytrace.c
branches/ndof/source/blender/render/intern/source/strand.c
branches/ndof/source/blender/src/editparticle.c
branches/ndof/source/blender/src/filelist.c
branches/ndof/source/blender/src/fsmenu.c
branches/ndof/source/blender/src/meshlaplacian.c
branches/ndof/source/blender/src/poselib.c
branches/ndof/source/blender/src/prvicons.c
branches/ndof/source/blender/src/radialcontrol.c
branches/ndof/source/blender/src/reeb.c
branches/ndof/source/blender/src/sculptmode-stroke.c
branches/ndof/source/blender/src/transform_orientations.c
branches/ndof/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/ndof/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/ndof/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/ndof/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
Removed Paths:
-------------
branches/ndof/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/ndof/source/blender/imbuf/intern/dds/BlockDXT.h
branches/ndof/source/blender/imbuf/intern/dds/Color.h
branches/ndof/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/ndof/source/blender/imbuf/intern/dds/ColorBlock.h
branches/ndof/source/blender/imbuf/intern/dds/Common.h
branches/ndof/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/ndof/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/ndof/source/blender/imbuf/intern/dds/Image.cpp
branches/ndof/source/blender/imbuf/intern/dds/Image.h
branches/ndof/source/blender/imbuf/intern/dds/Makefile
branches/ndof/source/blender/imbuf/intern/dds/SConscript
branches/ndof/source/blender/imbuf/intern/dds/Stream.cpp
branches/ndof/source/blender/imbuf/intern/dds/Stream.h
branches/ndof/source/blender/imbuf/intern/dds/dds_api.cpp
branches/ndof/source/blender/imbuf/intern/dds/dds_api.h
branches/ndof/source/blender/include/BPI_script.h
branches/ndof/source/blender/render/intern/source/ray.c
branches/ndof/source/blender/src/multires-firstlevel.c
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
Property Changed:
----------------
branches/ndof/source/blender/include/BIF_transform.h
branches/ndof/source/blender/include/transform.h
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/ndof/source/blender/python/api2_2x/Group.c
branches/ndof/source/blender/python/api2_2x/Group.h
branches/ndof/source/blender/python/api2_2x/doc/pupblock.blend
branches/ndof/source/blender/src/transform.c
branches/ndof/source/blender/src/transform_constraints.c
branches/ndof/source/blender/src/transform_conversions.c
branches/ndof/source/blender/src/transform_generics.c
branches/ndof/source/blender/src/transform_numinput.c
branches/ndof/source/blender/yafray/intern/api.cpp
branches/ndof/source/blender/yafray/intern/export_File.cpp
branches/ndof/source/blender/yafray/intern/export_File.h
branches/ndof/source/darwin/Makefile
branches/ndof/source/gameengine/BlenderRoutines/SConscript
branches/ndof/source/gameengine/Converter/SConscript
branches/ndof/source/gameengine/Expressions/SConscript
branches/ndof/source/gameengine/GameLogic/SConscript
branches/ndof/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.bmp
branches/ndof/source/gameengine/Ketsji/KXNetwork/SConscript
branches/ndof/source/gameengine/Network/LoopBackNetwork/SConscript
branches/ndof/source/gameengine/Network/SConscript
branches/ndof/source/gameengine/Physics/BlOde/SConscript
branches/ndof/source/gameengine/Physics/Dummy/SConscript
branches/ndof/source/gameengine/Physics/Sumo/SConscript
branches/ndof/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
branches/ndof/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
branches/ndof/source/gameengine/Physics/common/SConscript
branches/ndof/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/ndof/source/gameengine/Rasterizer/SConscript
branches/ndof/source/gameengine/SceneGraph/SConscript
branches/ndof/source/tools/guess/config.guess
branches/ndof/source/tools/guess/guessconfig
Modified: branches/ndof/source/Makefile
===================================================================
--- branches/ndof/source/Makefile 2008-03-13 22:45:36 UTC (rev 14099)
+++ branches/ndof/source/Makefile 2008-03-13 23:54:02 UTC (rev 14100)
@@ -56,11 +56,11 @@
BUILDINFO_C = $(SRCHOME)/creator/buildinfo.c
BUILD_DATE := $(shell date "+%Y-%m-%d")
BUILD_TIME := $(shell date "+%H:%M:%S")
+ BUILD_REV := $(shell svnversion)
endif
############# set pyplayerlib ##################
-PYPLAYERLIB ?= $(PYLIB)
############# libraries ##################
# COMLIB COMmon LIBraries for all targets
@@ -103,6 +103,8 @@
COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a
COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
+COMLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
+COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a
COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
COMLIB += $(NAN_JPEG)/lib/libjpeg.a
@@ -169,55 +171,34 @@
COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
+ifeq ($(WITH_DDS), true)
+ COMLIB += $(OCGDIR)/blender/imbuf/dds/$(DEBUG_DIR)libdds.a
+endif
+
+ifeq ($(WITH_BINRELOC), true)
+ COMLIB += $(OCGDIR)/extern/binreloc/$(DEBUG_DIR)libbinreloc.a
+endif
+
ifeq ($(WITH_FREETYPE2), true)
+ COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true)
+ COMLIB += $(NAN_FTGL)/lib/libftgl.a
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
else
+ COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
endif
else
+ COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifeq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
- else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+ else
+ COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif
endif
endif
-ifeq ($(INTERNATIONAL), true)
- COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
- ifeq ($(OS), windows)
- ifeq ($(FREE_WINDOWS), true)
- COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
- COMLIB += $(NAN_FTGL)/lib/libftgl.a
- #COMLIB += $(NAN_ICONV)/lib/freeiconv.a
- else
- COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
- COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
- COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
- COMLIB += $(NAN_ICONV)/lib/iconv.lib
- endif
- else
- COMLIB += $(NAN_FTGL)/lib/libftgl.a
- ifeq ($(OS), irix)
- COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
- COMLIB += $(NAN_FREETYPE)/lib32/libintl.a
- else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
- endif
- endif
- ifeq ($(OS), darwin)
- COMLIB += $(NAN_GETTEXT)/lib/libintl.a
- ifeq ($(CPU), i386)
- COMLIB += $(NAN_GETTEXT)/lib/libiconv.a
- endif
- endif
- ifeq ($(OS), solaris)
- COMLIB += $(NAN_GETTEXT)/lib/libintl.a
- endif
-endif
-
ifeq ($(WITH_VERSE), true)
ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true)
@@ -347,14 +328,7 @@
endif
endif
-ifdef PY_FRAMEWORK
- PYLIB = -framework Python
-else
- PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-endif
-
ifeq ($(OS),solaris)
- PYLIB += $(NAN_ZLIB)/lib/libz.a
PULIB += $(NAN_ZLIB)/lib/libz.a
SPLIB += $(NAN_ZLIB)/lib/libz.a
endif
@@ -429,15 +403,7 @@
endif
ifeq ($(OS),windows)
- ifeq ($(FREE_WINDOWS),true)
- PYLIB = $(NAN_PYTHON)/lib/freepy.a
- else
- PYLIB = $(NAN_PYTHON)/lib/python23.lib
- endif
- PYPLAYERLIB = $(NAN_PYTHON)/static/*.obj
- PYPLAYERLIB = $(PYLIB)
-
# Might need to change this to $(NAN_MOZILLA_LIB)/nspr4.lib
NSPLUGLIB += $(NAN_NSPR)/lib/nspr4.lib
@@ -540,10 +506,10 @@
$(DIR)/$(DEBUG_DIR)bin/blenderstatic: $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
- $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(SADD) $(LOPTS)
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -554,10 +520,10 @@
$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
- $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -568,10 +534,10 @@
$(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT): $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
- $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYPLAYERLIB) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -582,10 +548,10 @@
$(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT): $(OBJS) $(COMLIB) $(SPLIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
- $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(PYLIB) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderdynplayer$(EXT) $(BUILDINFO_O) $(OBJS) $(SPLIB1) $(COMLIB) $(SPLIB) $(LLIBS) $(DADD) $(LOPTS)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -596,7 +562,7 @@
$(DIR)/$(DEBUG_DIR)bin/Blender3DPlugin$(SOEXT): $(PLUGAPPLIB_XPLINK)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
$(CCC) $(DYNLDFLAGS) -o $@ $(PLUGAPPLIB_XPLINK) $(LOPTS)
@@ -612,10 +578,10 @@
$(DIR)/$(DEBUG_DIR)npB3DPlg$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
-# $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
- $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE)
+# $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS) /def:$(DEFFILE)
ifdef NAN_BUILDINFO
/bin/rm $(BUILDINFO_O)
endif
@@ -623,10 +589,10 @@
$(DIR)/$(DEBUG_DIR)bin/npBlender3DPlugin$(SOEXT): $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB)
@echo "****> Link $@"
ifdef NAN_BUILDINFO
- $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
+ $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO
endif
mkdir -p $(DIR)/$(DEBUG_DIR)bin
- $(CCC) $(DYNLDFLAGS) -o $@ $(NSPLUGLIB) $(PLUGAPPLIB) $(COMLIB) $(SPLIB) $(PYLIB) $(PLUGREMLIB) $(LLIBS) $(DADD) $(LOPTS)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list