[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/python/api2_2x Blender.c tuhopuu3/source/blender/src buttons_object.c

[Chris Want]

hos (Chris Want) 2005/01/15 22:41:52 CET

  Modified files:
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/src buttons_object.c 
  
  Log:
  OK, looks like the merge didn't go as smoothly as I'd hoped.
  
  Both the python menu thingy and the softbody panel thingy
  were botched and wouldn't build ... these should be checked!
  
  Revision  Changes    Path
  1.4       +1 -16     tuhopuu3/source/blender/python/api2_2x/Blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Blender.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +64 -54    tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>