2.5: multiple small fixes

- wm draw method is now initialized correct when reading older
  files, but the SDNA bug causing the problem is still unsolved.
  is due to // char pad[8]; not being recognized as commented.
- triple buffer proxy texture test follows spec better now,
  was disabling triple buffer unnecessarily on some drivers.
- some cmake compile fixes related to sequencer pthread usage
  and removed bad level calls lib for player.
- show outliner header buttons in oops mode as well until that
  can be switched in the UI.
- fix region data free issue for tooltips
- warning fixes

17 files changed, 34 insertions, 29 deletions

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index f455b094f5d..042b3b3046c 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -39,6 +39,7 @@ struct ListBase;
 struct MDeformVert;
 struct Mesh;
 struct MFace;
+struct MEdge;
 struct MVert;
 struct MCol;
 struct Object;
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 3948a2bf2af..46153b928aa 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -56,18 +56,12 @@ IF(WITH_FFMPEG)
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
-IF(WITH_PLAYER)
-  SUBDIRS(bad_level_call_stubs)
-ENDIF(WITH_PLAYER)
-
 IF(WITH_PYTHON)
   SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
   ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
-
 IF(WITH_INTERNATIONAL)
    ADD_DEFINITIONS(-DWITH_FREETYPE2)
 ENDIF(WITH_INTERNATIONAL)
@@ -75,3 +69,10 @@ ENDIF(WITH_INTERNATIONAL)
 IF(NOT WITH_ELBEEM)
   ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_ELBEEM)
+
+IF(WIN32)
+  SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
+
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index 9c5d67660ba..249d3db9423 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -2387,7 +2387,7 @@ void write_stl(Scene *scene, char *str)
 
 static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
 {
-	Mesh *me;
+	Mesh *me= ob->data;
 	EditMesh *em = me->edit_mesh;
 	Material *ma;
 	MFace *mface;
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 4cd282e094e..c2474e847ae 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -215,7 +215,7 @@ void IDP_ResizeArray(IDProperty *prop, int newlen)
 	/*first check if the array buffer size has room*/
 	/*if newlen is 200 chars less then totallen, reallocate anyway*/
 	if (newlen <= prop->totallen && prop->totallen - newlen < 200) {
-		idp_resize_group_array(prop, newlen, newarr);
+		idp_resize_group_array(prop, newlen, prop->data.pointer);
 		prop->len = newlen;
 		return;
 	}
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index ec4b8eb6d03..a09a428dc06 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -428,7 +428,7 @@ void multiresModifier_del_levels(struct MultiresModifierData *mmd, struct Object
 void multiresModifier_subdivide(MultiresModifierData *mmd, Object *ob, int distance, int updateblock, int simple)
 {
 	DerivedMesh *final = NULL;
-	int totsubvert, totsubface, totsubedge;
+	int totsubvert = 0, totsubface = 0, totsubedge = 0;
 	Mesh *me = get_mesh(ob);
 	MDisps *mdisps;
 	int i;
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 96dddb908d2..ce5225d50b9 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -223,6 +223,9 @@ void BKE_area_region_free(SpaceType *st, ARegion *ar)
 		if(art && art->free)
 			art->free(ar);
 	}
+	else if(ar->type && ar->type->free)
+		ar->type->free(ar);
+
 	if(ar) {
 		if(ar->regiondata)
 			printf("regiondata free error\n");
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index a21252d9aa8..a9e1e80a403 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -34,6 +34,7 @@
 
 /* ************************ FUNKTIES **************************** */
 
+#include <stdlib.h>
 #include <math.h>
 #include <sys/types.h>
 #include <string.h> 
@@ -62,13 +63,13 @@
 #define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
 #define CLAMP(a, b, c)		if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
 
-
-#if defined(WIN32) || defined(__APPLE__)
-#include <stdlib.h>
+#ifndef M_PI
 #define M_PI 3.14159265358979323846
-#define M_SQRT2 1.41421356237309504880   
+#endif
 
-#endif /* defined(WIN32) || defined(__APPLE__) */
+#ifndef M_SQRT2
+#define M_SQRT2 1.41421356237309504880   
+#endif
 
 
 float saacos(float fac)
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 03a565ef0bf..de9c8860c6a 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -279,7 +279,7 @@ void BLI_removeDoubleNodes(BGraph *graph, float limit)
 BNode * BLI_FindNodeByPosition(BGraph *graph, float *p, float limit)
 {
 	BNode *closest_node = NULL, *node;
-	float min_distance;
+	float min_distance = 0.0f;
 	
 	for(node = graph->nodes.first; node; node = node->next)
 	{
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index de4cf476967..f100a0f8965 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -238,7 +238,6 @@ ARegion *ui_add_temporary_region(bScreen *sc)
 
 void ui_remove_temporary_region(bContext *C, bScreen *sc, ARegion *ar)
 {
-	ar->regiondata= NULL;
 	wm_draw_region_clear(CTX_wm_window(C), ar);
 	ED_region_exit(C, ar);
 	BKE_area_region_free(NULL, ar);		/* NULL: no spacetype */
diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c
index 3c494dfaac4..f0cf5480e71 100644
--- a/source/blender/editors/space_outliner/outliner_header.c
+++ b/source/blender/editors/space_outliner/outliner_header.c
@@ -199,7 +199,7 @@ void outliner_header_buttons(const bContext *C, ARegion *ar)
 		uiBlockSetEmboss(block, UI_EMBOSS);
 	}
 	
-	if(soutliner->type==SO_OUTLINER) {
+	if(1) { // XXX soutliner->type==SO_OUTLINER) {
 		if(G.main->library.first) 
 			uiDefButS(block, MENU, B_REDR, "Outliner Display%t|Libraries %x7|All Scenes %x0|Current Scene %x1|Visible Layers %x2|Groups %x6|Same Types %x5|Selected %x3|Active %x4|Sequence %x10|Datablocks %x11|User Preferences %x12",	 xco, yco, 120, 20,  &soutliner->outlinevis, 0, 0, 0, 0, "");
 		else
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 2e5f64ad6c6..bdaa6407295 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1499,7 +1499,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop)
 	EditFace *efa;
 	MTFace *tf;
 	NearestHit hit;
-	int a, i, select, selectmode, sticky, sync, hitv[4], nvert;
+	int a, i, select = 1, selectmode, sticky, sync, hitv[4], nvert;
 	int flush = 0; /* 0 == dont flush, 1 == sel, -1 == desel;  only use when selection sync is enabled */
 	float limit[2], *hituv[4], penalty[2];
 	
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 307c116d596..e326be9d776 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -42,6 +42,7 @@ struct MTFace;
 struct Object;
 struct Scene;
 struct View3D;
+struct RegionView3D;
 
 /* OpenGL drawing functions related to shading. These are also
  * shared with the game engine, where there were previously
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index f2cc1f8017c..8de033d11e6 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -195,7 +195,8 @@ typedef struct UserDef {
 	short tb_leftmouse, tb_rightmouse;
 	struct SolidLight light[3];
 	short tw_hotspot, tw_flag, tw_handlesize, tw_size;
-	int textimeout, texcollectrate;
+	short textimeout,texcollectrate;
+	short wmdrawmethod, wmpad;
 	int memcachelimit;
 	int prefetchframes;
 	short frameserverport;
@@ -216,8 +217,6 @@ typedef struct UserDef {
 	short autokey_mode;		/* autokeying mode */
 	short autokey_flag;		/* flags for autokeying */
 
-	int wmdrawmethod, pad;
-	
 	struct ColorBand coba_weight;	/* from texture.h */
 } UserDef;
 
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index aece91d1c32..5e1f80d0a3c 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -794,11 +794,11 @@ static void rna_def_constraint_transform(BlenderRNA *brna)
 		{2, "SCALE", "Scale", ""},
 		{0, NULL, NULL, NULL}};
 
-	static EnumPropertyItem axis_map_items[] = {
+	/*static EnumPropertyItem axis_map_items[] = {
 		{0, "X", "X", ""},
 		{1, "Y", "Y", ""},
 		{2, "Z", "Z", ""},
-		{0, NULL, NULL, NULL}};
+		{0, NULL, NULL, NULL}};*/
 
 	srna= RNA_def_struct(brna, "TransformConstraint", "Constraint");
 	RNA_def_struct_ui_text(srna, "Transformation Constraint", "Maps transformations of the target to the object.");
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 7ad40d3dcd3..5ecab0ddbb5 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -455,7 +455,7 @@ static PyObject *pyrna_prop_subscript( BPy_PropertyRNA * self, PyObject *key )
 {
 	PyObject *ret;
 	PointerRNA newptr;
-	int keynum;
+	int keynum = 0;
 	char *keyname = NULL;
 	
 	if (PyUnicode_Check(key)) {
@@ -505,7 +505,7 @@ static PyObject *pyrna_prop_subscript( BPy_PropertyRNA * self, PyObject *key )
 static int pyrna_prop_assign_subscript( BPy_PropertyRNA * self, PyObject *key, PyObject *value )
 {
 	int ret = 0;
-	int keynum;
+	int keynum = 0;
 	char *keyname = NULL;
 	
 	if (!RNA_property_editable(&self->ptr, self->prop)) {
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 643a1370f80..c411bdeece8 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -408,7 +408,7 @@ static int wm_triple_gen_textures(wmWindow *win, wmDrawTriple *triple)
 			glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGB8, triple->x[x], triple->y[y], 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
 			glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &format);
 
-			if(format != GL_RGB8) {
+			if(format == 0) {
 				glBindTexture(triple->target, 0);
 				printf("WM: failed to allocate texture for triple buffer drawing (GL_PROXY_TEXTURE_2D).\n");
 				return 0;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 20258f3f2d3..e60eecc9a04 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -96,9 +96,6 @@
 /* patching UserDef struct and Themes */
 static void init_userdef_themes(void)
 {
-	// sets themes, fonts, .. from userdef
-	UI_init_userdef();
-	
 //	countall();
 	
 	/* the UserDef struct is not corrected with do_versions() .... ugh! */
@@ -366,6 +363,9 @@ static void init_userdef_themes(void)
 
 	MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
 	
+	// sets themes, fonts, .. from userdef
+	UI_init_userdef();
+	
 	/* funny name, but it is GE stuff, moves userdef stuff to engine */
 // XXX	space_set_commmandline_options();
 	/* this timer uses U */