[Bf-blender-cvs] CVS commit: blender/source/blender/src buttons_editing.c multires.c

[Nicholas Bishop]

nicholasbishop (Nicholas Bishop) 2007/01/02 19:42:42 CET

  Modified files:
    blender/source/blender/src buttons_editing.c multires.c 
  
  Log:
  Disabled interaction between multires and shape keys. Attempting to add a shape key on a multires mesh will give an error, and attempting to add multires to a mesh with shape keys will give the user an okee before deleting shape keys. (This isn't an optimal solution to the multires/shapekey situation, but a real fix is non-trivial.)
  
  Revision  Changes    Path
  1.332     +7 -3      blender/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/buttons_editing.c.diff?r1=1.331&r2=1.332&cvsroot=bf-blender>
  1.36      +18 -3     blender/source/blender/src/multires.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/multires.c.diff?r1=1.35&r2=1.36&cvsroot=bf-blender>