diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
| commit | 15ed8343437c6b304de72cd14591455da1d5b3ec (patch) | |
| tree | cbe40f76668f5e8539744c4d2f8aeaa0ded72f52 /source/blenderplayer | |
| parent | 5acd5d14970c829c2873623716a67beeb6da5278 (diff) | |
| parent | dd106b5c7a129e00bebe121c4da8cb90a16d48cb (diff) | |
Merged changes in the trunk up to revision 51718.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 04d4be05034..828b7f5066c 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -148,6 +148,7 @@ endif() extern_recastnavigation bf_intern_raskter bf_intern_opencolorio + bf_intern_opennl ) if(WITH_MOD_CLOTH_ELTOPO) @@ -169,10 +170,6 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_colamd) - if(WITH_MOD_DECIMATE) - list(APPEND BLENDER_SORTED_LIBS bf_intern_decimate) - endif() - if(WITH_MOD_BOOLEAN) list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 39ed89638b2..f33fe8c6538 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -62,7 +62,6 @@ struct Image; struct ImageUser; struct KeyingSet; struct KeyingSetInfo; -struct LOD_Decimation_Info; struct MCol; struct MTex; struct Main; @@ -78,6 +77,7 @@ struct Nurb; struct Object; struct PBVHNode; struct PyObject; +struct Quadric; struct Render; struct RenderEngine; struct RenderEngineType; @@ -137,6 +137,13 @@ int BLI_smallhash_count(struct SmallHash *hash) { return 0; } void *BLI_smallhash_iternext(struct SmallHashIter *iter, uintptr_t *key) { return NULL; } void *BLI_smallhash_iternew(struct SmallHash *hash, struct SmallHashIter *iter, uintptr_t *key) { return NULL; } +void BLI_quadric_from_v3_dist(struct Quadric *q, const float v[3], const float offset) {} +void BLI_quadric_add_qu_qu(struct Quadric *a, const struct Quadric *b) {} +void BLI_quadric_add_qu_ququ(struct Quadric *r, const struct Quadric *a, const struct Quadric *b) {} +void BLI_quadric_mul(struct Quadric *a, const float scalar) {} +float BLI_quadric_evaluate(const struct Quadric *q, const float v[3]) {return 0.0f;} +int BLI_quadric_optimize(const struct Quadric *q, float v[3]) {return 0;} + float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return (float *) NULL;} float RE_filter_value(int type, float x) {return 0.0f;} struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name) {return (struct RenderLayer *)NULL;} |