From 29f279e43dfac8e1e08dbe272d7092eab5a8067d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 22 Oct 2011 17:01:54 +0000 Subject: Render API: add update_progress() function to update progress bar progress from external render engines. Also refactoring to move some render engine registration stuff out of RNA and into render module. --- source/blenderplayer/bad_level_call_stubs/stubs.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blenderplayer') diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 788b4e40eb2..8b9ef3835d2 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -375,6 +375,7 @@ struct RenderResult *RE_AcquireResultRead(struct Render *re){return (struct Rend struct RenderResult *RE_AcquireResultWrite(struct Render *re){return (struct RenderResult *) NULL;} struct RenderStats *RE_GetStats(struct Render *re){return (struct RenderStats *) NULL;} void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result){} +void RE_engine_update_progress(struct RenderEngine *engine, float progress) {} void RE_engine_end_result(struct RenderEngine *engine, struct RenderResult *result){} void RE_engine_update_stats(struct RenderEngine *engine, char *stats, char *info){} void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, char *filename){} @@ -383,7 +384,11 @@ void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr){} void RE_ReleaseResult(struct Render *re){} void RE_ReleaseResultImage(struct Render *re){} int RE_engine_test_break(struct RenderEngine *engine){return 0;} +void RE_engines_init() {} +void RE_engines_exit() {} void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) {} +ListBase R_engines = {NULL, NULL}; +void RE_engine_free(struct RenderEngine *engine) {} /* python */ struct wmOperatorType *WM_operatortype_find(const char *idname, int quiet){return (struct wmOperatorType *) NULL;} -- cgit v1.2.3 From 4a04f7206914a49f5f95adc5eb786237f1a9f547 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 23 Oct 2011 17:52:20 +0000 Subject: remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n --- source/blenderplayer/CMakeLists.txt | 3 ++- source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 1 - source/blenderplayer/bad_level_call_stubs/stubs.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blenderplayer') diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 82847cb8079..701ad244fc1 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -1,5 +1,4 @@ # -*- mode: cmake; indent-tabs-mode: t; -*- -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -165,6 +164,8 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_lzma) endif() + list(APPEND BLENDER_SORTED_LIBS extern_colamd) + if(WITH_MOD_DECIMATE) list(APPEND BLENDER_SORTED_LIBS bf_intern_decimate) endif() diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 0610cf2fdbe..afd5f5b0177 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 8b9ef3835d2..1dbed479d40 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or -- cgit v1.2.3