[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_node.h blender/source/blender/blenkernel/intern node.c node_composite.c blender/source/blender/include BIF_drawimage.h BIF_space.h blender/source/blender/makesdna DNA_scene_types.h blender/source/blender/render/intern/source pipeline.c ...

[Ton Roosendaal]

ton (Ton Roosendaal) 2006/02/09 12:07:04 CET

  Modified files:
    blender/source/blender/blenkernel BKE_node.h 
    blender/source/blender/blenkernel/intern node.c 
                                             node_composite.c 
    blender/source/blender/include BIF_drawimage.h BIF_space.h 
    blender/source/blender/makesdna DNA_scene_types.h 
    blender/source/blender/render/intern/source pipeline.c 
    blender/source/blender/src drawimage.c interface_panel.c 
                               space.c 
  
  Log:
  Compositing workflow upgrade;
  
  You now can set a Preview panel in the Image window, to define a sub-rect
  of an image to be processed. Works like the preview in 3D Window. Just
  press SHIFT+P to get it activated. Very nice speedup!
  
  This is how it works:
  
  - The compositor still uses the scene image size (including % setting) for
    Viewer or Composite output size
  - If a preview exists, it calculates the cropped rect from its position
    in the Image window, and stores that in the Scene render data
  - On composite execute, it copies only this part from the 'generator nodes',
    right now Images or Render Results. That makes the entire composite tree
    only using small rects, so it will execute fast.
  - Also the render window will only display the cropped rect, and on F12
    only the cropped part is being executed
  - On rendering in background mode, the cropping is ignored though.
  
  Usability notes:
  
  - translating or zooming view will automatically invoke a recalculation
  - if you zoom in on details, the calculated rect will even become smaller
  - only one Imagewindow can have this Preview Panel, to prevent conflicts of
    what the cropped area should be. Compositing is on Scene level, not local
    per image window. (Note; 3D Previews are local per window!)
  - Closing the preview panel will invoke a full-size recalculation
  - All passes/layers from rendering are nicely cropped, including Z and
    vectors.
  
  The work to make the compositor do cropping was simple, but getting the
  Image window displaying correctly and get all events OK was a lot of work...
  indeed, we need to refactor Image Window usage once. Sorry for making the
  mess even bigger now. :) I've tried not to interfere with UV edit or Paint
  though... only when you're in compositing mode the panel will work.
  
  BUG fix:
  
  3D Preview render didn't work when multiple layers were set in the current
  scene.
  
  Revision  Changes    Path
  1.8       +2 -1      blender/source/blender/blenkernel/BKE_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_node.h.diff?r1=1.7&r2=1.8&cvsroot=bf-blender>
  1.13      +5 -1      blender/source/blender/blenkernel/intern/node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/node.c.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.12      +163 -97   blender/source/blender/blenkernel/intern/node_composite.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/node_composite.c.diff?r1=1.11&r2=1.12&cvsroot=bf-blender>
  1.13      +2 -1      blender/source/blender/include/BIF_drawimage.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/include/BIF_drawimage.h.diff?r1=1.12&r2=1.13&cvsroot=bf-blender>
  1.37      +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.36&r2=1.37&cvsroot=bf-blender>
  1.59      +4 -2      blender/source/blender/makesdna/DNA_scene_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.58&r2=1.59&cvsroot=bf-blender>
  1.18      +2 -0      blender/source/blender/render/intern/source/pipeline.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/render/intern/source/pipeline.c.diff?r1=1.17&r2=1.18&cvsroot=bf-blender>
  1.52      +177 -9    blender/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawimage.c.diff?r1=1.51&r2=1.52&cvsroot=bf-blender>
  1.35      +10 -5     blender/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/interface_panel.c.diff?r1=1.34&r2=1.35&cvsroot=bf-blender>
  1.334     +26 -11    blender/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/space.c.diff?r1=1.333&r2=1.334&cvsroot=bf-blender>