diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 07:53:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 07:53:55 +0300 |
commit | 8227b3d463955d887a987fe546d8eefa2757a982 (patch) | |
tree | 47be10b02d3418b579dc95ca796f2d7c596571e9 /source/blender/editors/render | |
parent | 57ce3072d191480ab8bdfcb1f4b841452819467a (diff) |
remove/comment unused vars
also removed unnecessary NULL checks (where the pointer was used later without checking).
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 7 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 8a4a0433eb8..c2b2a0ad457 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -130,20 +130,19 @@ static void screen_opengl_render_apply(OGLRender *oglrender) */ if(view_context) { - int is_ortho; GPU_offscreen_bind(oglrender->ofs); /* bind */ /* render 3d view */ if(rv3d->persp==RV3D_CAMOB && v3d->camera) { + /*int is_ortho= scene->r.mode & R_ORTHO;*/ RE_GetCameraWindow(oglrender->re, v3d->camera, scene->r.cfra, winmat); - is_ortho= scene->r.mode & R_ORTHO; } else { rctf viewplane; float clipsta, clipend; - - is_ortho= get_view3d_viewplane(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL); + + int is_ortho= get_view3d_viewplane(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL); if(is_ortho) orthographic_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, -clipend, clipend); else perspective_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend); } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 44fce4819f3..560819b5e0f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -851,6 +851,10 @@ static int save_envmap(wmOperator *op, Scene *scene, EnvMap *env, char *str, int ibuf = IMB_allocImBuf(dx, dx, 24, IB_rectfloat); IMB_rectcpy(ibuf, env->cube[1], 0, 0, 0, 0, dx, dx); } + else { + BKE_report(op->reports, RPT_ERROR, "Invalid environment map type"); + return OPERATOR_CANCELLED; + } if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ibuf->profile = IB_PROFILE_LINEAR_RGB; |