[tuhopuu-cvs] CVS commit: tuhopuu2/source/blender/yafray/intern export_File.cpp tuhopuu2/source/blender/src drawimage.c buttons_object.c tuhopuu2/proj_msvc6_ng/blender/BPY_python BPY_python.dsp

[Jens Ole Wund (bjornmose)]

bjornmose (Jens Ole Wund(bjornmose)) 2004/08/04 21:22:21 CEST

  Modified files:
    tuhopuu2/source/blender/yafray/intern export_File.cpp 
    tuhopuu2/source/blender/src drawimage.c buttons_object.c 
    tuhopuu2/proj_msvc6_ng/blender/BPY_python BPY_python.dsp 
  
  Log:
  Post merge resolution
  
  in
  /source/blender/src/drawimage.c
  handle metamorphosis of function in "gl_util"
  sdrawXORcirc(short,short,float) went to vast void
  fdrawXORcirc(float,float,float) did arise from vast void
  /* only comes up with the new painting functions
  #ifdef BM_TEXTUREPAINT ...
  */
  
  MSVC6 issues:
  in
  /source/blender/yafray/intern/export_File.cpp
  function
  bool yafrayFileRender_t::writeWorld()
  removed unneeded variable declarations MSVC6 compiler did not like
  
  in
  /source/blender/src/buttons_object.c
  added function prototypes at top of file (before use) for proper linking:
  static void object_panel_deflectors(Object *ob);
  void object_panel_effects(Object *ob);
  (i dunno if this really is a MSCV6 issue )
  
  in
  /proj_msvc6_ng/blender/BPY_python/BPY_python.dsp
  added new files to project, helped to find includes
  /* dunno if "old" MSVC6 project files build at all */
  
  BTW great job Hos! At a first glance "user perfs" look OK here.
  
  Revision  Changes    Path
  1.7       +0 -1      tuhopuu2/source/blender/yafray/intern/export_File.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/yafray/intern/export_File.cpp.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.25      +3 -3      tuhopuu2/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/drawimage.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.21      +2 -0      tuhopuu2/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/blender/src/buttons_object.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
  1.3       +18 -2     tuhopuu2/proj_msvc6_ng/blender/BPY_python/BPY_python.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/proj_msvc6_ng/blender/BPY_python/BPY_python.dsp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>