[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel/intern node_composite.c blender/source/blender/src sequence.c

[Ton Roosendaal]

ton (Ton Roosendaal) 2006/07/02 11:56:41 CEST

  Modified files:
    blender/source/blender/blenkernel/intern node_composite.c 
    blender/source/blender/src sequence.c 
  
  Log:
  Bugfix #4561
  
  Sequence renders, calling scenes with compositing, didn't execute composite
  correctly. Confusement caused by the rule that a "Render" handle has same
  name as Scene, which gives conflict for the case when a Scene has
  sequencing with Scene strips with its own scene in it.
  
  The previous solution for that conflict caused composite not to work. This
  commit solves that, but it is still hackish. Main reason is the still
  bad global G.scene, in use by compositor.
  
  Revision  Changes    Path
  1.50      +3 -3      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.49&r2=1.50&cvsroot=bf-blender>
  1.53      +17 -8     blender/source/blender/src/sequence.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/sequence.c.diff?r1=1.52&r2=1.53&cvsroot=bf-blender>