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:
authorCampbell Barton <ideasman42@gmail.com>2013-03-21 20:06:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-21 20:06:46 +0400
commitfdc3b7dfefbd980c8606a3a2639fbceaeb52cb13 (patch)
treed566a48261299dc14cf6f24959d65e07e4ef3524 /source/blenderplayer
parenta8b6b5ec4c5c864fccda0e10990b65a784fd89e3 (diff)
fix for own recent commit - added function into wrong side of ifdef
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/CMakeLists.txt1
-rw-r--r--source/blenderplayer/bad_level_call_stubs/SConscript21
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c2
3 files changed, 14 insertions, 10 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index afd5f5b0177..2996a672c5a 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -29,6 +29,7 @@ remove_strict_flags()
set(INC
.
..
+ ../../blender/blenlib
../../blender/blenkernel
../../blender/blenloader
../../blender/makesdna
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index f26f4dfea6b..5b796746061 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -27,18 +27,19 @@
Import ('env')
-sources = 'stubs.c'
+sources = ['stubs.c']
-incs = '#/intern/guardedalloc'
-incs += ' #/source/blender/makesdna'
-incs += ' #/source/blender/makesrna'
-incs += ' #/source/blender/blenloader'
+incs = [
+ '#/intern/guardedalloc',
+ '#/source/blender/makesdna',
+ '#/source/blender/makesrna',
+ '#/source/blender/blenloader',
+ '#/source/blender/blenlib',
+ ]
-defs = ''
-if env['WITH_BF_INTERNATIONAL']:
- defs += 'WITH_FREETYPE2'
+defs = []
if env['WITH_BF_GAMEENGINE']:
- defs += ' WITH_GAMEENGINE'
+ defs.append('WITH_GAMEENGINE')
-env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] )
+env.BlenderLib('blenkernel_blc', sources=sources, includes=incs, defines=defs, libtype=['player'], priority=[220])
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index d85d4048793..392655bb1b1 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -34,6 +34,7 @@
#ifdef WITH_GAMEENGINE
#include <stdlib.h>
#include "DNA_listBase.h"
+#include "BLI_utildefines.h"
#include "RNA_types.h"
struct ARegion;
@@ -340,6 +341,7 @@ int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, stru
void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) {}
void ED_object_editmode_enter(struct bContext *C, int flag) {}
void ED_object_editmode_exit(struct bContext *C, int flag) {}
+bool ED_object_editmode_load(struct Object *obedit) { return false; }
int uiLayoutGetActive(struct uiLayout *layout) {return 0;}
int uiLayoutGetOperatorContext(struct uiLayout *layout) {return 0;}
int uiLayoutGetAlignment(struct uiLayout *layout) {return 0;}