[Soc-2006-cvs] CVS commit: soc-blender README soc-blender/extern Makefile soc-blender/extern/bullet/Bullet/CollisionShapes ConvexTriangleCallback.h soc-blender/extern/bullet/BulletDynamics/ConstraintSolver OdeConstraintSolver.h SimpleConstraintSolver.h SorLcp.cpp SorLcp.h soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics CcdPhysicsEnvironment.cpp CcdPhysicsEnvironment.h ...

[Nicholas Bishop]

nicholasbishop (Nicholas Bishop) 2006/09/21 04:34:31 CEST

  Modified files:        (Branch: nicholasbishop)
    .                    README 
    soc-blender/extern   Makefile 
    soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics 
                                                                 CcdPhysicsEnvironment.cpp 
                                                                 CcdPhysicsEnvironment.h 
    soc-blender/intern/ghost/intern GHOST_EventCursor.h 
    soc-blender/release/scripts blender2cal3d.py 
                                mesh_poly_reduce.py mesh_skin.py 
                                object_apply_def.py uv_archimap.py 
    soc-blender/release/scripts/bpymodules BPyWindow.py 
                                           mesh_gradient.py 
  Removed files:         (Branch: nicholasbishop)
    soc-blender/extern/bullet/Bullet/CollisionShapes 
                                                     ConvexTriangleCallback.h 
    soc-blender/extern/bullet/BulletDynamics/ConstraintSolver 
                                                              OdeConstraintSolver.h 
                                                              SimpleConstraintSolver.h 
                                                              SorLcp.cpp 
                                                              SorLcp.h 
    soc-blender/extern/ffmpeg Makefile_blender common_blender.mak 
    soc-blender/release/scripts Apply_def.py archimap.py 
                                batch_name_edit.py bvh2arm.py 
                                bvh_export.py clean_mesh.py 
                                fixfromarmature.py kloputils.py 
                                mesh_bbrush_menu.py 
                                mirror_bone_weights.py 
                                obj_import.py sel_same.py skin.py 
                                uv_auto_layout_tex.py uv_relax.py 
                                wings_export.py wings_import.py 
    soc-blender/release/scripts/bpydata mesh_bbrush.py 
    soc-blender/release/scripts/colladaImEx collada.py cstartup.py 
                                            cutils.py 
                                            translator.py 
                                            xmlUtils.py 
    soc-blender/release/text release_240.txt release_241.txt 
    soc-blender/source/blender/render/intern/include edgeRender.h 
    soc-blender/source/blender/render/intern/source edgeRender.c 
  
  Log:
  Fixed more merge errors; mostly removing files that shouldn't be there
  
  Revision  Changes    Path
  1.1.1.1.4.3 +0 -1      soc-blender/README
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/README.diff?r1=1.1.1.1.4.2&r2=1.1.1.1.4.3&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.3 +1 -2      soc-blender/extern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/Makefile.diff?r1=1.1.1.1.4.2&r2=1.1.1.1.4.3&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.4 +0 -23     soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp.diff?r1=1.1.1.1.4.3&r2=1.1.1.1.4.4&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.3 +0 -1      soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h.diff?r1=1.1.1.1.4.2&r2=1.1.1.1.4.3&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.2 +1 -0      soc-blender/intern/ghost/intern/GHOST_EventCursor.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/ghost/intern/GHOST_EventCursor.h.diff?r1=1.1.1.1.4.1&r2=1.1.1.1.4.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.2 +0 -2      soc-blender/release/scripts/blender2cal3d.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/blender2cal3d.py.diff?r1=1.1.1.1.4.1&r2=1.1.1.1.4.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.4 +1 -1      soc-blender/release/scripts/mesh_poly_reduce.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/mesh_poly_reduce.py.diff?r1=1.1.1.1.4.3&r2=1.1.1.1.4.4&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.2.2   +82 -37    soc-blender/release/scripts/mesh_skin.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/mesh_skin.py.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.2.2   +2 -24     soc-blender/release/scripts/object_apply_def.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/object_apply_def.py.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.2.2   +168 -108  soc-blender/release/scripts/uv_archimap.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/uv_archimap.py.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.2.2   +154 -124  soc-blender/release/scripts/bpymodules/BPyWindow.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/bpymodules/BPyWindow.py.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.2.2   +3 -2      soc-blender/release/scripts/bpymodules/mesh_gradient.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/release/scripts/bpymodules/mesh_gradient.py.diff?r1=1.1.2.1&r2=1.1.2.2&cvsroot=soc-2006&only_with_tag=nicholasbishop>