Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-06-25 11:22:28 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-06-25 11:22:28 +0400
commitd3b6117068eb1d03f0c66aab7d0c667951223709 (patch)
tree088db05004ae219401573d001068ebd61f304e71 /source/blender/render
parent54db7f1b43b08f3bfd0ce28b24f8ed22e82282cf (diff)
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.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index f161e139989..3e5868edeb9 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -702,7 +702,7 @@ void RE_progress_cb(Render *re, void *handle, void (*f)(void *handle, float))
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))