[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37446] trunk/blender/source/gameengine/ GameLogic: Fix #27635: GLSL filter uniform variable not set for group instance.

[Brecht Van Lommel]

Revision: 37446
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37446
Author:   blendix
Date:     2011-06-13 11:36:25 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
Fix #27635: GLSL filter uniform variable not set for group instance.

The problem was that SCA_2DFilterActuator was defining and using a
variable called "m_gameObj", when it should be using "m_gameobj" as
defined by SCA_ILogicBrick. The way it was, reparenting did only half
the work required to duplicate the actuator.

Patch by Alex Fraser, thanks!

Modified Paths:
--------------
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2011-06-13 09:33:27 UTC (rev 37445)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2011-06-13 11:36:25 UTC (rev 37446)
@@ -55,10 +55,10 @@
 	 m_rasterizer(rasterizer),
 	 m_scene(scene)
 {
-	m_gameObj = NULL;
+	m_gameobj = NULL;
 	if(gameobj){
 		m_propNames = gameobj->GetPropertyNames();
-		m_gameObj = gameobj;
+		m_gameobj = gameobj;
 	}
 }
 
@@ -91,7 +91,7 @@
 	}
 	else if(m_type < RAS_2DFilterManager::RAS_2DFILTER_NUMBER_OF_FILTERS)
 	{
-		m_scene->Update2DFilter(m_propNames, m_gameObj, m_type, m_int_arg, m_shaderText);
+		m_scene->Update2DFilter(m_propNames, m_gameobj, m_type, m_int_arg, m_shaderText);
 	}
 	// once the filter is in place, no need to update it again => disable the actuator
     return false;

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2011-06-13 09:33:27 UTC (rev 37445)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2011-06-13 11:36:25 UTC (rev 37446)
@@ -42,7 +42,6 @@
 
 private:
 	vector<STR_String> m_propNames;
-	void * m_gameObj;
 	RAS_2DFilterManager::RAS_2DFILTER_MODE m_type;
 	short m_disableMotionBlur;
 	float m_float_arg;