[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18318] branches/blender2.5/blender/source /blender: 2.5

[Martin Poirier]

Revision: 18318
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18318
Author:   theeth
Date:     2009-01-04 20:10:57 +0100 (Sun, 04 Jan 2009)

Log Message:
-----------
2.5

Fix compile error with AVI support

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h
    
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
    branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c

Modified: 
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h
===================================================================
--- 
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h    
    2009-01-04 18:26:43 UTC (rev 18317)
+++ 
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h    
    2009-01-04 19:10:57 UTC (rev 18318)
@@ -36,7 +36,7 @@
 
 extern void start_frameserver(struct RenderData *rd, int rectx, int recty);
 extern void end_frameserver(void);
-extern void append_frameserver(int frame, int *pixels, int rectx, int recty);
+extern void append_frameserver(struct RenderData *rd, int frame, int *pixels, 
int rectx, int recty);
 extern int frameserver_loop(struct RenderData *rd);
 
 #ifdef __cplusplus

Modified: 
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c 
    2009-01-04 18:26:43 UTC (rev 18317)
+++ 
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c 
    2009-01-04 19:10:57 UTC (rev 18318)
@@ -355,7 +355,7 @@
        connsock = -1;
 }
 
-void append_frameserver(int frame, int *pixels, int rectx, int recty)
+void append_frameserver(RenderData *rd, int frame, int *pixels, int rectx, int 
recty)
 {
        fprintf(stderr, "Serving frame: %d\n", frame);
        if (write_ppm) {

Modified: 
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c  
2009-01-04 18:26:43 UTC (rev 18317)
+++ branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c  
2009-01-04 19:10:57 UTC (rev 18318)
@@ -2503,7 +2503,7 @@
                        dofree = 1;
                }
                RE_ResultGet32(re, (unsigned int *)rres.rect32);
-               mh->append_movie(scene->r.cfra, rres.rect32, rres.rectx, 
rres.recty);
+               mh->append_movie(&re->r, scene->r.cfra, rres.rect32, 
rres.rectx, rres.recty);
                if(dofree) {
                        MEM_freeN(rres.rect32);
                }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs