diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/editors/render/render_preview.c | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
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 b6601807443..3e001ef25b5 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -1296,7 +1296,7 @@ static void icon_preview_endjob(void *customdata) int i; /* signal to gpu texture */ - for (i = 0; i < NUM_ICON_SIZES; ++i) { + for (i = 0; i < NUM_ICON_SIZES; i++) { if (prv_img->gputexture[i]) { GPU_texture_free(prv_img->gputexture[i]); prv_img->gputexture[i] = NULL; |