Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Hughes <khughes@pacific.edu>2006-11-17 20:50:43 +0300
committerKen Hughes <khughes@pacific.edu>2006-11-17 20:50:43 +0300
commit318a694a2592af3324df5b0bde2a66db67f55145 (patch)
treec636131e9268c142b16d9c6d920aec1c8194c1af /source/blender/src
parent27c42ee06233e889f95ac5114f785c6b354c176f (diff)
Get rid of various warnings with gcc under linux
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/editmesh_tools.c4
-rw-r--r--source/blender/src/editseq.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index 635937bc7af..e0f01d0695d 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -3155,10 +3155,10 @@ static float isfaceConcave(float fake[4][3])
areaB = AreaT3Dfl(fake[1], fake[2], fake[3]) + AreaT3Dfl(fake[3], fake[0], fake[1]);
if(areaA <= areaB) minarea = areaA;
- else if(areaB < areaA) minarea = areaB;
+ else minarea = areaB;
if(areaA >= areaB) maxarea = areaA;
- else if(areaB > areaA) maxarea = areaB;
+ else maxarea = areaB;
if(!maxarea) return 1;
else return 1 - (minarea / maxarea);
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index 62704c5abda..48832a29093 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -1121,7 +1121,6 @@ static int add_seq_effect(int type, char *str)
int cfra, machine;
short mval[2];
struct SeqEffectHandle sh;
- int mode;
if(G.scene->ed==0) return 0;
ed= G.scene->ed;