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:
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Canvas.h7
-rw-r--r--source/gameengine/GamePlayer/common/SConscript2
-rw-r--r--source/gameengine/GamePlayer/ghost/SConscript2
3 files changed, 6 insertions, 5 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index 87719041f65..a65bad59d60 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -125,10 +125,11 @@ public:
return m_displayarea;
};
- RAS_Rect &
- GetDisplayArea(
+ void
+ SetDisplayArea(
+ RAS_Rect *rect
) {
- return m_displayarea;
+ m_displayarea= *rect;
};
RAS_Rect &
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 99eda4cb592..51fc2fc7334 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -61,7 +61,7 @@ incs = ['.',
defs = []
if env['WITH_BF_PYTHON']:
- incs += ' ' + env['BF_PYTHON_INC']
+ incs += Split(env['BF_PYTHON_INC'])
else:
defs.append('DISABLE_PYTHON')
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index cfb827cf8c3..93769e60401 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -43,7 +43,7 @@ incs = ['.',
defs = []
if env['WITH_BF_PYTHON']:
- incs += ' ' + env['BF_PYTHON_INC']
+ incs += Split(env['BF_PYTHON_INC'])
else:
defs.append('DISABLE_PYTHON')