Revision: 44729
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44729
Author: campbellbarton
Date: 2012-03-08 04:38:35 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
code cleanup: duplicate checks and double assignments.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-03-08 04:12:11 UTC (rev 44728)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-03-08 04:38:35 UTC (rev 44729)
@@ -2224,7 +2224,6 @@
/*find-replace merged vertices with target vertices*/
ml = cddm->mloop;
- c = 0;
for (i=0; i<totloop; i++, ml++) {
if (vtargetmap[ml->v] != -1) {
ml->v = vtargetmap[ml->v];
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-08
04:12:11 UTC (rev 44728)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-08
04:38:35 UTC (rev 44729)
@@ -567,9 +567,7 @@
for (a=0; a<me->totpoly; a++, txface++) {
/* special case: ima always local
immediately */
if (txface->tpage) {
- if (txface->tpage) {
- id_lib_extern((ID
*)txface->tpage);
- }
+ id_lib_extern((ID
*)txface->tpage);
}
}
}
@@ -582,9 +580,7 @@
for (a=0; a<me->totface; a++, tface++) {
/* special case: ima always local
immediately */
if (tface->tpage) {
- if (tface->tpage) {
- id_lib_extern((ID
*)tface->tpage);
- }
+ id_lib_extern((ID
*)tface->tpage);
}
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
2012-03-08 04:12:11 UTC (rev 44728)
+++ trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
2012-03-08 04:38:35 UTC (rev 44729)
@@ -299,7 +299,7 @@
BMO_slot_mat4_get(op, "mat", mat);
phid = 2.0f * (float)M_PI / tot;
- phi = 0.25f * (float)M_PI;
+ /* phi = 0.25f * (float)M_PI; */ /* UNUSED */
/* one segment first */
phi = 0;
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2012-03-08
04:12:11 UTC (rev 44728)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2012-03-08
04:38:35 UTC (rev 44729)
@@ -576,10 +576,9 @@
selar= MEM_callocN(me->totpoly+1, "selar");
- if (extend == 0 && select)
+ if (extend == 0 && select) {
paintface_deselect_all_visible(vc->obact, SEL_DESELECT, FALSE);
- if (extend == 0 && select) {
mface= me->mpoly;
for(a=1; a<=me->totpoly; a++, mface++) {
if((mface->flag & ME_HIDE) == 0)
Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c 2012-03-08 04:12:11 UTC
(rev 44728)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c 2012-03-08 04:38:35 UTC
(rev 44729)
@@ -289,9 +289,9 @@
{
if (lcd->eed) {
edgering_sel(lcd, cuts, 0);
- } else if(lcd->edges) {
- if (lcd->edges)
- MEM_freeN(lcd->edges);
+ }
+ else if (lcd->edges) {
+ MEM_freeN(lcd->edges);
lcd->edges = NULL;
lcd->totedge = 0;
}
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2012-03-08
04:12:11 UTC (rev 44728)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2012-03-08
04:38:35 UTC (rev 44729)
@@ -183,12 +183,12 @@
* really needed to prevent different unexpected behaviors like with
intel gme965 card (sergey) */
glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
- GG.os = GPU_OS_UNIX;
#ifdef _WIN32
GG.os = GPU_OS_WIN;
-#endif
-#ifdef __APPLE__
+#elif defined(__APPLE__)
GG.os = GPU_OS_MAC;
+#else
+ GG.os = GPU_OS_UNIX;
#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
