diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
| commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
| tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/render | |
| parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
| parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index f3072163f1f..a73f3dd1be6 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -762,7 +762,7 @@ static int render_break(void *UNUSED(rjv)) } /* runs in thread, no cursor setting here works. careful with notifiers too (malloc conflicts) */ -/* maybe need a way to get job send notifer? */ +/* maybe need a way to get job send notifier? */ static void render_drawlock(void *rjv, int lock) { RenderJob *rj = rjv; |