diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-23 17:01:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-23 17:01:10 +0300 |
| commit | 08706122682507fd8f994109305f4120d54648ff (patch) | |
| tree | d8da899bf4637be367e66dff1fad49d79162df9d /source/blender/editors/render | |
| parent | 23848a70de47273496111e29c53d1d7b64c4c090 (diff) | |
Cleanup: use int for view_id's & view count
`size_t` is useful for memory sizes or offsets,
the number of views wont realistically exceed an int.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4c10c07e189..57aafb549ac 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -192,7 +192,7 @@ static void image_buffer_rect_update(RenderJob *rj, RenderResult *rr, ImBuf *ibu /* TODO(sergey): Need to check has_combined here? */ if (iuser->pass == 0) { RenderView *rv; - size_t view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); + const int view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); rv = RE_RenderViewGetById(rr, view_id); /* find current float rect for display, first case is after composite... still weak */ diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 51c4e8bc16e..263abe752c2 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -105,7 +105,7 @@ typedef struct OGLRender { bMovieHandle *mh; int cfrao, nfra; - size_t totvideos; + int totvideos; /* quick lookup */ int view_id; @@ -622,7 +622,7 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) { Main *bmain = CTX_data_main(C); Scene *scene = oglrender->scene; - size_t i; + int i; if (oglrender->mh) { if (BKE_imtype_is_movie(scene->r.im_format.imtype)) { @@ -680,7 +680,8 @@ static bool screen_opengl_render_anim_initialize(bContext *C, wmOperator *op) oglrender->reports = op->reports; if (BKE_imtype_is_movie(scene->r.im_format.imtype)) { - size_t i, width, height; + size_t width, height; + int i; BKE_scene_multiview_videos_dimensions_get(&scene->r, oglrender->sizex, oglrender->sizey, &width, &height); oglrender->mh = BKE_movie_handle_get(scene->r.im_format.imtype); |