fix for own recent commit - added function into wrong side of ifdef
This commit is contained in:
@@ -76,6 +76,8 @@ static EnumPropertyItem space_items[] = {
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_report.h"
|
||||
|
||||
#include "ED_object.h"
|
||||
|
||||
#include "DNA_curve_types.h"
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
@@ -391,6 +393,7 @@ void rna_Object_dm_info(struct Object *ob, int type, char *result)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* NDEBUG */
|
||||
|
||||
static int rna_Object_update_from_editmode(Object *ob)
|
||||
{
|
||||
@@ -399,8 +402,6 @@ static int rna_Object_update_from_editmode(Object *ob)
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif /* NDEBUG */
|
||||
|
||||
#else /* RNA_RUNTIME */
|
||||
|
||||
void RNA_api_object(StructRNA *srna)
|
||||
|
||||
@@ -29,6 +29,7 @@ remove_strict_flags()
|
||||
set(INC
|
||||
.
|
||||
..
|
||||
../../blender/blenlib
|
||||
../../blender/blenkernel
|
||||
../../blender/blenloader
|
||||
../../blender/makesdna
|
||||
|
||||
@@ -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])
|
||||
|
||||
@@ -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;}
|
||||
|
||||
Reference in New Issue
Block a user