[Bf-blender-cvs] [746b934] gooseberry: fixes for last merge

[Campbell Barton]

Commit: 746b93497f680f75baebc7b4f4077db697672899
Author: Campbell Barton
Date:   Thu Nov 13 17:35:21 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB746b93497f680f75baebc7b4f4077db697672899

fixes for last merge

===================================================================

M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/physics/intern/BPH_mass_spring.cpp
M	source/blender/physics/intern/implicit_blender.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 6237e39..9100393 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -34,6 +34,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
+#include "BLI_threads.h"
 
 #include "IMB_imbuf_types.h"
 
@@ -1338,8 +1339,8 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 
 			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-			uiSetRoundBox(UI_CNR_ALL);
-			uiDrawBox(GL_LINE_LOOP, x1, y1, x2, y2, 12.0);
+			UI_draw_roundbox_corner_set(UI_CNR_ALL);
+			UI_draw_roundbox_gl_mode(GL_LINE_LOOP, x1, y1, x2, y2, 12.0);
 
 			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index ee58dca..cc1f3d3 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -876,7 +876,7 @@ static void cloth_continuum_step(ClothModifierData *clmd, float dt)
 	const float fluid_factor = 0.95f; /* blend between PIC and FLIP methods */
 	float smoothfac = parms->velocity_smooth;
 	float pressfac = parms->pressure;
-	float minpress = parms->pressure_threshold;
+//	float minpress = parms->pressure_threshold;
 	float gmin[3], gmax[3];
 	int i;
 	
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 550b91b..b9a7c04 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -326,6 +326,8 @@ static void print_sparse_matrix(fmatrix3x3 *m)
 }
 #endif
 
+
+#if 0
 static void print_lvector(lfVector *v, int numverts)
 {
 	int i;
@@ -338,7 +340,9 @@ static void print_lvector(lfVector *v, int numverts)
 		printf("%f,\n", v[i][2]);
 	}
 }
+#endif
 
+#if 0
 static void print_bfmatrix(fmatrix3x3 *m)
 {
 	int tot = m[0].vcount + m[0].scount;
@@ -381,6 +385,7 @@ static void print_bfmatrix(fmatrix3x3 *m)
 	
 	MEM_freeN(t);
 }
+#endif
 
 /* copy 3x3 matrix */
 DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3])