diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-04 12:28:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-04 12:28:37 +0400 |
commit | 019dca9c54289136b34c688a048ee009e2e852ee (patch) | |
tree | 3d1fda905f9b53310a0a948dfba7bd039b273f5a /source/blender/blenkernel | |
parent | 91c38f0aa0e68e94f51861172862e233716c54d8 (diff) |
remove redundant code, also dont bother with os.path.basename(x) for recent scons commit.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index ce4cc284bb0..81a31c83e95 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3060,14 +3060,13 @@ void object_camera_matrix( void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const short do_clip, const float scale[3], float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]) { - float aspx, aspy; float facx, facy; float depth; /* aspect correcton */ if (scene) { - aspx= (float) scene->r.xsch*scene->r.xasp; - aspy= (float) scene->r.ysch*scene->r.yasp; + float aspx= (float) scene->r.xsch*scene->r.xasp; + float aspy= (float) scene->r.ysch*scene->r.yasp; if(aspx < aspy) { r_asp[0]= aspx / aspy; @@ -3079,8 +3078,6 @@ void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const sh } } else { - aspx= 1.0f; - aspy= 1.0f; r_asp[0]= 1.0f; r_asp[1]= 1.0f; } diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 70b44792b30..d8d6ed6ea6d 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1639,8 +1639,6 @@ float hyp3,hyp4,b4,b5 if(wipezone->flip) x = xo - x; angle = wipezone->angle; - posy = facf0 * yo; - if(wipe->forward){ posx = facf0 * xo; posy = facf0 * yo; @@ -2320,7 +2318,7 @@ static void RVBlurBitmap2_byte ( unsigned char* map, int width,int height, /* Swap buffers */ - swap=temp;temp=map;map=swap; + swap=temp;temp=map; /* map=swap; */ /* UNUSED */ /* Tidy up */ MEM_freeN (filter); @@ -2490,7 +2488,7 @@ static void RVBlurBitmap2_float ( float* map, int width,int height, /* Swap buffers */ - swap=temp;temp=map;map=swap; + swap=temp;temp=map; /* map=swap; */ /* UNUSED */ /* Tidy up */ MEM_freeN (filter); |