Revision: 40782
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40782
Author: campbellbarton
Date: 2011-10-04 08:28:37 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
remove redundant code, also dont bother with os.path.basename(x) for recent
scons commit.
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2011-10-04 08:20:29 UTC
(rev 40781)
+++ trunk/blender/build_files/scons/tools/Blender.py 2011-10-04 08:28:37 UTC
(rev 40782)
@@ -626,9 +626,9 @@
run("rm -rf '%s/lib2to3'" % py_target)
run("rm -rf '%s/config'" % py_target)
- for x in os.listdir(py_target):
- if os.path.basename(x).startswith('config-'):
- run("rm -rf '%s/%s'" % (py_target, x))
+ for f in os.listdir(py_target):
+ if f.startswith("config-"):
+ run("rm -rf '%s/%s'" % (py_target, f))
run("rm -rf '%s/site-packages'" % py_target)
run("mkdir '%s/site-packages'" % py_target) # python needs it.'
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-10-04
08:20:29 UTC (rev 40781)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-10-04
08:28:37 UTC (rev 40782)
@@ -3060,14 +3060,13 @@
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 @@
}
}
else {
- aspx= 1.0f;
- aspy= 1.0f;
r_asp[0]= 1.0f;
r_asp[1]= 1.0f;
}
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-10-04
08:20:29 UTC (rev 40781)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-10-04
08:28:37 UTC (rev 40782)
@@ -1639,8 +1639,6 @@
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 @@
/* Swap buffers */
- swap=temp;temp=map;map=swap;
+ swap=temp;temp=map; /* map=swap; */ /* UNUSED */
/* Tidy up */
MEM_freeN (filter);
@@ -2490,7 +2488,7 @@
/* Swap buffers */
- swap=temp;temp=map;map=swap;
+ swap=temp;temp=map; /* map=swap; */ /* UNUSED */
/* Tidy up */
MEM_freeN (filter);
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-10-04 08:20:29 UTC (rev 40781)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-10-04 08:28:37 UTC (rev 40782)
@@ -2690,9 +2690,7 @@
tf = ps->dm_mtface+face_index;
if (tpage_last != tf->tpage) {
tpage_last = tf->tpage;
-
- image_index = -1; /* sanity check */
-
+
for (image_index=0; image_index <
ps->image_tot; image_index++) {
if (ps->projImages[image_index].ima ==
tpage_last) {
ibuf =
ps->projImages[image_index].ibuf;
@@ -4900,7 +4898,6 @@
time= PIL_check_seconds_timer();
tablet= 0;
- pressure= 0;
pop->s.blend= pop->s.brush->blend;
if(event->custom == EVT_DATA_TABLET) {
@@ -4911,8 +4908,9 @@
if(wmtab->Active == EVT_TABLET_ERASER)
pop->s.blend= IMB_BLEND_ERASE_ALPHA;
}
- else /* otherwise airbrush becomes 1.0 pressure instantly */
+ else { /* otherwise airbrush becomes 1.0 pressure instantly */
pressure= pop->prev_pressure ? pop->prev_pressure : 1.0f;
+ }
if(pop->first) {
pop->prevmouse[0]= event->mval[0];
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2011-10-04 08:20:29 UTC (rev 40781)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2011-10-04 08:28:37 UTC (rev 40782)
@@ -5103,8 +5103,6 @@
}
}
else {
- a= 0;
-
fac= (float)(CIRCLE_RESOL-1) * tot_inv;
x= sinval[start] * fac;
y= cosval[start] * fac;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
