[tuhopuu-cvs] CVS commit: tuhopuu2 configure.ac tuhopuu2/intern/ghost/intern GHOST_WindowCarbon.cpp tuhopuu2/projectfiles/blender blender.dsp tuhopuu2/projectfiles/blender/src BL_src.dsp tuhopuu2/source/blender/blenkernel BKE_constraint.h tuhopuu2/source/blender/blenkernel/intern Makefile ...

[Chris Want]

hos (Chris Want) 2003/11/29 23:07:42 CET

  Modified files:
    .                    configure.ac 
    tuhopuu2/intern/ghost/intern GHOST_WindowCarbon.cpp 
    tuhopuu2/projectfiles/blender blender.dsp 
    tuhopuu2/projectfiles/blender/src BL_src.dsp 
    tuhopuu2/source/blender/blenkernel BKE_constraint.h 
    tuhopuu2/source/blender/blenkernel/intern Makefile 
                                              constraint.c 
                                              displist.c exotic.c 
                                              mball.c object.c 
                                              text.c 
    tuhopuu2/source/blender/blenlib BLI_editVert.h 
    tuhopuu2/source/blender/blenloader/intern readfile.c 
    tuhopuu2/source/blender/ftfont/intern FTF_TTFont.cpp 
    tuhopuu2/source/blender/include BIF_interface.h 
                                    BIF_resources.h interface.h 
    tuhopuu2/source/blender/makesdna DNA_constraint_types.h 
                                     DNA_mesh_types.h 
                                     DNA_userdef_types.h 
    tuhopuu2/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu2/source/blender/src Makefile buttons_object.c 
                                buttons_shading.c drawmesh.c 
                                drawnla.c drawobject.c drawview.c 
                                edit.c editarmature.c 
                                editconstraint.c editipo.c 
                                editmball.c editmesh.c 
                                editobject.c editscreen.c 
                                editview.c filesel.c ghostwinlay.c 
                                header_info.c headerbuttons.c 
                                interface.c language.c renderwin.c 
                                resources.c space.c spacetypes.c 
                                toets.c toolbox.c usiblender.c 
                                view.c vpaint.c 
  
  Log:
  Post merge conflict resolution (part one?)
  
  Revision  Changes    Path
  1.8       +1 -1      tuhopuu2/configure.ac
  1.4       +8 -4      tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.cpp
  1.8       +2 -2      tuhopuu2/projectfiles/blender/blender.dsp
  1.7       +2 -2      tuhopuu2/projectfiles/blender/src/BL_src.dsp
  1.3       +2 -1      tuhopuu2/source/blender/blenkernel/BKE_constraint.h
  1.3       +2 -2      tuhopuu2/source/blender/blenkernel/intern/Makefile
  1.8       +86 -21    tuhopuu2/source/blender/blenkernel/intern/constraint.c
  1.4       +3 -2      tuhopuu2/source/blender/blenkernel/intern/displist.c
  1.5       +1 -2      tuhopuu2/source/blender/blenkernel/intern/exotic.c
  1.4       +10 -1     tuhopuu2/source/blender/blenkernel/intern/mball.c
  1.4       +3 -2      tuhopuu2/source/blender/blenkernel/intern/object.c
  1.3       +26 -29    tuhopuu2/source/blender/blenkernel/intern/text.c
  1.4       +2 -4      tuhopuu2/source/blender/blenlib/BLI_editVert.h
  1.6       +13 -6     tuhopuu2/source/blender/blenloader/intern/readfile.c
  1.4       +4 -4      tuhopuu2/source/blender/ftfont/intern/FTF_TTFont.cpp
  1.6       +14 -1     tuhopuu2/source/blender/include/BIF_interface.h
  1.6       +4 -1      tuhopuu2/source/blender/include/BIF_resources.h
  1.5       +7 -6      tuhopuu2/source/blender/include/interface.h
  1.4       +2 -1      tuhopuu2/source/blender/makesdna/DNA_constraint_types.h
  1.3       +4 -3      tuhopuu2/source/blender/makesdna/DNA_mesh_types.h
  1.9       +2 -2      tuhopuu2/source/blender/makesdna/DNA_userdef_types.h
  1.6       +20 -27    tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
  1.3       +2 -2      tuhopuu2/source/blender/src/Makefile
  1.3       +118 -79   tuhopuu2/source/blender/src/buttons_object.c
  1.4       +413 -306  tuhopuu2/source/blender/src/buttons_shading.c
  1.4       +1 -2      tuhopuu2/source/blender/src/drawmesh.c
  1.4       +3 -3      tuhopuu2/source/blender/src/drawnla.c
  1.23      +61 -24    tuhopuu2/source/blender/src/drawobject.c
  1.5       +77 -61    tuhopuu2/source/blender/src/drawview.c
  1.8       +5 -5      tuhopuu2/source/blender/src/edit.c
  1.7       +9 -5      tuhopuu2/source/blender/src/editarmature.c
  1.10      +13 -2     tuhopuu2/source/blender/src/editconstraint.c
  1.4       +1 -2      tuhopuu2/source/blender/src/editipo.c
  1.5       +1 -2      tuhopuu2/source/blender/src/editmball.c
  1.43      +233 -188  tuhopuu2/source/blender/src/editmesh.c
  1.30      +79 -49    tuhopuu2/source/blender/src/editobject.c
  1.10      +15 -11    tuhopuu2/source/blender/src/editscreen.c
  1.8       +15 -15    tuhopuu2/source/blender/src/editview.c
  1.6       +5 -7      tuhopuu2/source/blender/src/filesel.c
  1.4       +4 -3      tuhopuu2/source/blender/src/ghostwinlay.c
  1.3       +3 -3      tuhopuu2/source/blender/src/header_info.c
  1.15      +4 -3      tuhopuu2/source/blender/src/headerbuttons.c
  1.8       +189 -7    tuhopuu2/source/blender/src/interface.c
  1.4       +4 -2      tuhopuu2/source/blender/src/language.c
  1.4       +2 -2      tuhopuu2/source/blender/src/renderwin.c
  1.7       +25 -3     tuhopuu2/source/blender/src/resources.c
  1.26      +57 -57    tuhopuu2/source/blender/src/space.c
  1.3       +2 -2      tuhopuu2/source/blender/src/spacetypes.c
  1.4       +2 -3      tuhopuu2/source/blender/src/toets.c
  1.5       +14 -12    tuhopuu2/source/blender/src/toolbox.c
  1.9       +5 -7      tuhopuu2/source/blender/src/usiblender.c
  1.9       +3 -4      tuhopuu2/source/blender/src/view.c
  1.4       +1 -2      tuhopuu2/source/blender/src/vpaint.c