Revision: 44810
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44810
Author:   campbellbarton
Date:     2012-03-11 17:24:03 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
[#30503] Callback for render job completion
from Jason van Gumster (thefallenweeble)

adds render_complete and render_cancel callbacks to bpy.app.handlers

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_callbacks.h
    trunk/blender/source/blender/python/intern/bpy_app_handlers.c
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/blenlib/BLI_callbacks.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_callbacks.h        2012-03-11 
16:25:58 UTC (rev 44809)
+++ trunk/blender/source/blender/blenlib/BLI_callbacks.h        2012-03-11 
17:24:03 UTC (rev 44810)
@@ -42,6 +42,8 @@
        BLI_CB_EVT_RENDER_PRE,
        BLI_CB_EVT_RENDER_POST,
        BLI_CB_EVT_RENDER_STATS,
+       BLI_CB_EVT_RENDER_COMPLETE,
+       BLI_CB_EVT_RENDER_CANCEL,
        BLI_CB_EVT_LOAD_PRE,
        BLI_CB_EVT_LOAD_POST,
        BLI_CB_EVT_SAVE_PRE,

Modified: trunk/blender/source/blender/python/intern/bpy_app_handlers.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_handlers.c       
2012-03-11 16:25:58 UTC (rev 44809)
+++ trunk/blender/source/blender/python/intern/bpy_app_handlers.c       
2012-03-11 17:24:03 UTC (rev 44810)
@@ -47,6 +47,8 @@
        {(char *)"render_pre",        (char *)"Callback list - on render 
(before)"},
        {(char *)"render_post",       (char *)"Callback list - on render 
(after)"},
        {(char *)"render_stats",      (char *)"Callback list - on printing 
render statistics"},
+       {(char *)"render_complete",   (char *)"Callback list - on completion of 
render job"},
+       {(char *)"render_cancel",     (char *)"Callback list - on cancelling a 
render job"},
        {(char *)"load_pre",          (char *)"Callback list - on loading a new 
blend file (before)"},
        {(char *)"load_post",         (char *)"Callback list - on loading a new 
blend file (after)"},
        {(char *)"save_pre",          (char *)"Callback list - on saving a 
blend file (before)"},

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c        
2012-03-11 16:25:58 UTC (rev 44809)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c        
2012-03-11 17:24:03 UTC (rev 44810)
@@ -2022,6 +2022,8 @@
                BLI_exec_cb(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* 
keep after file save */
        }
 
+       BLI_exec_cb(re->main, (ID *)scene, G.afbreek ? BLI_CB_EVT_RENDER_CANCEL 
: BLI_CB_EVT_RENDER_COMPLETE);
+
        /* UGLY WARNING */
        G.rendering= 0;
 }
@@ -2239,6 +2241,8 @@
 
        re->flag &= ~R_ANIMATION;
 
+       BLI_exec_cb(re->main, (ID *)scene, G.afbreek ? BLI_CB_EVT_RENDER_CANCEL 
: BLI_CB_EVT_RENDER_COMPLETE);
+
        /* UGLY WARNING */
        G.rendering= 0;
 }

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

Reply via email to