[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57725] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix typo made back in svn rev35785

Sergey Sharybin sergey.vfx at gmail.com
Tue Jun 25 09:22:28 CEST 2013


Revision: 57725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57725
Author:   nazgul
Date:     2013-06-25 07:22:28 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Fix typo made back in svn rev35785

Callback handle was assigning to wrong storage in RE_draw_lock_cb.
So far it was completely harmless because all the callbacks are
using the same handle, so test_break_callback was using correct
handle, and since draw_lock_callback didn't use handle at all
nobody noticed this.

But this typo lead to draw_lock_callback using NULL instead of
real RenderJob, which is bad for the feature we're working in
GSoC branch.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35785

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	2013-06-25 00:49:43 UTC (rev 57724)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-06-25 07:22:28 UTC (rev 57725)
@@ -702,7 +702,7 @@
 void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, int i))
 {
 	re->draw_lock = f;
-	re->tbh = handle;
+	re->dlh = handle;
 }
 
 void RE_test_break_cb(Render *re, void *handle, int (*f)(void *handle))




More information about the Bf-blender-cvs mailing list