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:
authorCampbell Barton <ideasman42@gmail.com>2018-01-19 09:21:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-19 09:21:15 +0300
commitc850320b35863edc35f0b0acd1c75ed48bb71542 (patch)
treec3de2f92410308c0ece880a901864727b5731fc3 /source/blender/editors/render/render_preview.c
parent4d3d002b653c5b28320ada6b9d7f1e8c80bf944c (diff)
parent7a24e0d175827824d139f7627de2a5af34d687fb (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
-rw-r--r--source/blender/editors/render/render_preview.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 1d6aefcb48c..2e3091268a9 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -721,7 +721,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r
if (ok)
*rect = newrect;
- /* start a new preview render job if signalled through sbuts->preview,
+ /* start a new preview render job if signaled through sbuts->preview,
* if no render result was found and no preview render job is running,
* or if the job is running and the size of preview changed */
if ((sbuts != NULL && sbuts->preview) ||