[Bf-blender-cvs] CVS commit: blender/source/blender/include BIF_space.h blender/source/blender/python/api2_2x Object.c blender/source/blender/python/api2_2x/doc Object.py blender/source/blender/src editarmature.c editcurve.c header_view3d.c meshtools.c space.c

[Campbell Barton]

campbellbarton (Campbell Barton) 2005/12/30 15:17:16 CET

  Modified files:
    blender/source/blender/include BIF_space.h 
    blender/source/blender/python/api2_2x Object.c 
    blender/source/blender/python/api2_2x/doc Object.py 
    blender/source/blender/src editarmature.c editcurve.c 
                               header_view3d.c meshtools.c space.c 
  
  Log:
  Added a python hook to Joining objects
  Object.Join()
  
  Seperated the join calls from space.c and view3dmenu into join_menu() in space.c, like the select_group_menu(),
  okee's from join_curve, join_mesh.. etc are in join_menu() so python can call them without UI menu's in the way.
  this is also a bit neater since there were 2 places that were doing what join_menu() does now.
  
  - Cam
  
  Revision  Changes    Path
  1.35      +2 -1      blender/source/blender/include/BIF_space.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_space.h.diff?r1=1.34&r2=1.35&cvsroot=bf-blender>
  1.152     +74 -1     blender/source/blender/python/api2_2x/Object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Object.c.diff?r1=1.151&r2=1.152&cvsroot=bf-blender>
  1.52      +13 -0     blender/source/blender/python/api2_2x/doc/Object.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Object.py.diff?r1=1.51&r2=1.52&cvsroot=bf-blender>
  1.102     +2 -5      blender/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editarmature.c.diff?r1=1.101&r2=1.102&cvsroot=bf-blender>
  1.45      +2 -7      blender/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/editcurve.c.diff?r1=1.44&r2=1.45&cvsroot=bf-blender>
  1.148     +2 -7      blender/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_view3d.c.diff?r1=1.147&r2=1.148&cvsroot=bf-blender>
  1.24      +0 -1      blender/source/blender/src/meshtools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/meshtools.c.diff?r1=1.23&r2=1.24&cvsroot=bf-blender>
  1.322     +28 -9     blender/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.321&r2=1.322&cvsroot=bf-blender>