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:
authorMitchell Stokes <mogurijin@gmail.com>2013-01-01 01:32:46 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-01-01 01:32:46 +0400
commitd0981c279b9705e076045c7af7faf6e90937cd96 (patch)
tree6dc9c534e5c83bd9f7fecf7b2444f74b2bd0d243 /source/gameengine/GameLogic
parent2787c78175eb7f12e48afe65098779444ff83720 (diff)
BGE: Fixing a crash that occurred when LibLoading a scene with a 2D Filter Actuator. The actuator was still referencing the old scene.
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r--source/gameengine/GameLogic/SCA_2DFilterActuator.cpp5
-rw-r--r--source/gameengine/GameLogic/SCA_2DFilterActuator.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
index 5ad5aedbd39..6a87d3ccb98 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -97,6 +97,11 @@ bool SCA_2DFilterActuator::Update()
}
+void SCA_2DFilterActuator::SetScene(SCA_IScene *scene)
+{
+ m_scene = scene;
+}
+
void SCA_2DFilterActuator::SetShaderText(const char *text)
{
m_shaderText = text;
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
index a754d950859..4635a8ad9f8 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
@@ -64,6 +64,8 @@ public:
virtual ~SCA_2DFilterActuator();
virtual bool Update();
+ void SetScene(SCA_IScene *scene);
+
virtual CValue* GetReplica();
};
#endif