Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/interface/interface.c
	source/blender/editors/interface/interface_handlers.c
	source/blender/editors/interface/interface_intern.h
	source/blender/editors/interface/resources.c

6 files changed, 45 insertions, 21 deletions

diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index f1ce8356e20..cedc27c3b92 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -75,6 +75,12 @@ texturewidth(-1), textureheight(-1),
 RAS_2DFilterManager::~RAS_2DFilterManager()
 {
 	FreeTextures();
+
+	for (int passindex = 0; passindex < MAX_RENDER_PASS; passindex++) {
+		if (m_filters[passindex]) {
+			glDeleteObjectARB(m_filters[passindex]);
+		}
+	}
 }
 
 void RAS_2DFilterManager::PrintShaderErrors(unsigned int shader, const char *task, const char *code)
@@ -119,11 +125,10 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(const char* shadersource)
 
 
 	glGetObjectParameterivARB(fShader, GL_COMPILE_STATUS, &success);
-	if (!success)
-	{
+	if (!success) {
 		/*Shader Comile Error*/
 		PrintShaderErrors(fShader, "compile", shadersource);
-		return 0;
+		goto fail;
 	}
 		
 	program = glCreateProgramObjectARB();
@@ -131,23 +136,37 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(const char* shadersource)
 
 	glLinkProgramARB(program);
 	glGetObjectParameterivARB(program, GL_LINK_STATUS, &success);
-	if (!success)
-	{
+	if (!success) {
 		/*Program Link Error*/
 		PrintShaderErrors(fShader, "link", shadersource);
-		return 0;
+		goto fail;
 	}
 	
 	glValidateProgramARB(program);
 	glGetObjectParameterivARB(program, GL_VALIDATE_STATUS, &success);
-	if (!success)
-	{
+	if (!success) {
 		/*Program Validation Error*/
 		PrintShaderErrors(fShader, "validate", shadersource);
-		return 0;
+		goto fail;
+	}
+
+	/* owned by 'program' */
+	if (fShader) {
+		glDeleteObjectARB(fShader);
 	}
 
 	return program;
+
+
+fail:
+	if (fShader) {
+		glDeleteObjectARB(fShader);
+	}
+
+	if (program) {
+		glDeleteObjectARB(program);
+	}
+	return 0;
 }
 
 unsigned int RAS_2DFilterManager::CreateShaderProgram(int filtermode)
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 269cd7dec0a..bd84c3c96b1 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -99,9 +99,9 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, int storage)
 	m_motionblur(0),
 	m_motionblurvalue(-1.0),
 	m_usingoverrideshader(false),
-    m_clientobject(NULL),
-    m_auxilaryClientInfo(NULL),
-    m_drawingmode(KX_TEXTURED),
+	m_clientobject(NULL),
+	m_auxilaryClientInfo(NULL),
+	m_drawingmode(KX_TEXTURED),
 	m_texco_num(0),
 	m_attrib_num(0),
 	//m_last_alphablend(GPU_BLEND_SOLID),
@@ -1215,10 +1215,9 @@ void RAS_OpenGLRasterizer::RemoveLight(RAS_ILightObject* lightobject)
 		m_lights.erase(lit);
 }
 
-bool RAS_OpenGLRasterizer::RayHit(struct KX_ClientObjectInfo *client, KX_RayCast *result, void * const data)
+bool RAS_OpenGLRasterizer::RayHit(struct KX_ClientObjectInfo *client, KX_RayCast *result, double *oglmatrix)
 {
 	if (result->m_hitMesh) {
-		double* const oglmatrix = (double* const) data;
 
 		RAS_Polygon* poly = result->m_hitMesh->GetPolygon(result->m_hitPolygon);
 		if (!poly->IsVisible())
@@ -1303,7 +1302,7 @@ void RAS_OpenGLRasterizer::applyTransform(double* oglmatrix,int objectdrawmode )
 		                   up[0],   up[1],   up[2],   0,
 		                   0,       0,       0,       1};
 
-		glTranslated(objpos[0],objpos[1],objpos[2]);
+		glTranslatef(objpos[0],objpos[1],objpos[2]);
 		glMultMatrixd(maat);
 
 	}
@@ -1328,7 +1327,7 @@ void RAS_OpenGLRasterizer::applyTransform(double* oglmatrix,int objectdrawmode )
 			if (!physics_controller && parent)
 				physics_controller = parent->GetPhysicsController();
 
-			KX_RayCast::Callback<RAS_OpenGLRasterizer> callback(this, physics_controller, oglmatrix);
+			KX_RayCast::Callback<RAS_OpenGLRasterizer, double> callback(this, physics_controller, oglmatrix);
 			if (!KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback))
 			{
 				// couldn't find something to cast the shadow on...
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index ad49ebe5179..67a11f64726 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -45,6 +45,8 @@ using namespace std;
 #include "RAS_MaterialBucket.h"
 #include "RAS_IPolygonMaterial.h"
 
+#include "BLI_utildefines.h"
+
 class RAS_IStorage;
 class RAS_ICanvas;
 class RAS_OpenGLLight;
@@ -306,8 +308,10 @@ public:
 	void PushMatrix();
 	void PopMatrix();
 
-	bool RayHit(struct KX_ClientObjectInfo *client, class KX_RayCast *result, void * const data);
-	bool NeedRayCast(struct KX_ClientObjectInfo *) { return true; }
+	/// \see KX_RayCast
+	bool RayHit(struct KX_ClientObjectInfo *client, class KX_RayCast *result, double *oglmatrix);
+	/// \see KX_RayCast
+	bool NeedRayCast(struct KX_ClientObjectInfo *, void *UNUSED(data)) { return true; }
 
 	RAS_ILightObject* CreateLight();
 	void AddLight(RAS_ILightObject* lightobject);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 93905f733dc..ce520df2a21 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -3,7 +3,8 @@ Import ('env')
 
 sources = env.Glob('*.cpp')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '.',
diff --git a/source/gameengine/Rasterizer/RAS_texmatrix.cpp b/source/gameengine/Rasterizer/RAS_texmatrix.cpp
index 3203fcf9d6b..d30a3d3a75d 100644
--- a/source/gameengine/Rasterizer/RAS_texmatrix.cpp
+++ b/source/gameengine/Rasterizer/RAS_texmatrix.cpp
@@ -34,7 +34,7 @@
 
 void RAS_CalcTexMatrix(RAS_TexVert p[3],MT_Point3& origin,MT_Vector3& udir,MT_Vector3& vdir)
 {
-// precondition: 3 vertices are non-colinear
+// precondition: 3 vertices are non-collinear
 
 	MT_Vector3 vec1 = p[1].xyz()-p[0].xyz();
 	MT_Vector3 vec2 = p[2].xyz()-p[0].xyz();
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index c0d725ad957..a643f46e39a 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -46,7 +46,8 @@ incs = [
     '#source/blender/makesdna',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_PYTHON']:
     incs.extend(Split(env['BF_PYTHON_INC']))