Revision: 42513
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42513
Author:   blendix
Date:     2011-12-08 14:21:55 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Tweak related to #29545: show info message if no frames are written in animation
render due to disabled Overwrite option.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c        
2011-12-08 12:55:34 UTC (rev 42512)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c        
2011-12-08 14:21:55 UTC (rev 42513)
@@ -3084,7 +3084,7 @@
 {
        bMovieHandle *mh= BKE_get_movie_handle(scene->r.im_format.imtype);
        int cfrao= scene->r.cfra;
-       int nfra;
+       int nfra, totrendered= 0, totskipped= 0;
        
        /* do not fully call for each frame, it initializes & pops output 
window */
        if(!render_initialize_from_main(re, bmain, scene, NULL, 
camera_override, lay, 0, 1))
@@ -3109,6 +3109,7 @@
                                BLI_exec_cb(re->main, (ID *)scene, 
BLI_CB_EVT_RENDER_PRE);
 
                                do_render_all_options(re);
+                               totrendered++;
 
                                if(re->test_break(re->tbh) == 0) {
                                        if(!do_write_image_or_movie(re, bmain, 
scene, mh, NULL))
@@ -3157,6 +3158,7 @@
 
                                if(scene->r.mode & R_NO_OVERWRITE && 
BLI_exists(name)) {
                                        printf("skipping existing frame 
\"%s\"\n", name);
+                                       totskipped++;
                                        continue;
                                }
                                if(scene->r.mode & R_TOUCH && 
!BLI_exists(name)) {
@@ -3172,6 +3174,7 @@
 
                        
                        do_render_all_options(re);
+                       totrendered++;
                        
                        if(re->test_break(re->tbh) == 0) {
                                if(!G.afbreek)
@@ -3201,6 +3204,9 @@
        /* end movie */
        if(BKE_imtype_is_movie(scene->r.im_format.imtype))
                mh->end_movie();
+       
+       if(totskipped && totrendered == 0)
+               BKE_report(re->reports, RPT_INFO, "No frames rendered, skipped 
to not overwrite");
 
        scene->r.cfra= cfrao;
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to