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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-08 02:12:19 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-08 02:12:19 +0400
commita8a2782d34fd09a35598c2653a8225942c4c2ca0 (patch)
tree4715ccd75214e81662e2cfa684aaad610c8d25e5 /source/blenderplayer
parentdd633f1affc8951a0a6ba19cdffbb58ac7f54acd (diff)
parentb51908b913f318986a91c766980ed01010c5249a (diff)
Merged changes in the trunk up to revision 51985.
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 41741dd9a5b..2d37b0e1401 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -463,6 +463,7 @@ void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) {}
ListBase R_engines = {NULL, NULL};
void RE_engine_free(struct RenderEngine *engine) {}
struct RenderEngineType *RE_engines_find(const char *idname) { return NULL; }
+void RE_engine_update_memory_stats(struct RenderEngine *engine, float mem_used, float mem_peak) {};
/* python */
struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet) {return (struct wmOperatorType *) NULL;}