diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blenderplayer | |
parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/SConscript | 3 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index afd5f5b0177..702210d1c5f 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -60,4 +60,8 @@ if(WITH_GAMEENGINE) add_definitions(-DWITH_GAMEENGINE) endif() +if(WITH_FREESTYLE) + add_definitions(-DWITH_FREESTYLE) +endif() + blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript index f26f4dfea6b..41c84051fdf 100644 --- a/source/blenderplayer/bad_level_call_stubs/SConscript +++ b/source/blenderplayer/bad_level_call_stubs/SConscript @@ -41,4 +41,7 @@ if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_GAMEENGINE']: defs += ' WITH_GAMEENGINE' +if env['WITH_BF_FREESTYLE']: + defs += ' WITH_FREESTYLE' + env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(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 014fefb8219..f394290d952 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -55,8 +55,10 @@ struct FCurve; struct Heap; struct HeapNode; struct ID; +#ifdef WITH_FREESTYLE struct FreestyleConfig; struct FreestyleLineSet; +#endif struct ImBuf; struct Image; struct ImageUser; @@ -85,7 +87,9 @@ struct RenderLayer; struct RenderResult; struct Scene; struct Scene; +#ifdef WITH_FREESTYLE struct SceneRenderLayer; +#endif struct ScrArea; struct SculptSession; struct ShadeInput; @@ -520,6 +524,7 @@ int pyrna_id_FromPyObject(struct PyObject *obj, struct ID **id) { return 0; } struct PyObject *pyrna_id_CreatePyObject(struct ID *id) {return NULL; } void BPY_context_update(struct bContext *C) {}; +#ifdef WITH_FREESTYLE /* Freestyle */ void FRS_add_freestyle_config(struct SceneRenderLayer* srl) {} void FRS_free_freestyle_config(struct SceneRenderLayer* srl) {} @@ -527,6 +532,7 @@ struct FreestyleLineSet *FRS_get_active_lineset(struct FreestyleConfig *config) short FRS_get_active_lineset_index(struct FreestyleConfig *config) { return 0; } void FRS_set_active_lineset_index(struct FreestyleConfig *config, short index) {} void FRS_unlink_target_object(struct FreestyleConfig *config, struct Object *ob) {} +#endif /* intern/dualcon */ struct DualConMesh; struct DualConMesh *dualcon(const struct DualConMesh *input_mesh, |