diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
| commit | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (patch) | |
| tree | 64b1fec1adcc399eb1de5cd86ebafd753a921d8d /source/blenderplayer/bad_level_call_stubs | |
| parent | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (diff) | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
* Merge trunk up to r39790.soc-2011-pepper
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
Diffstat (limited to 'source/blenderplayer/bad_level_call_stubs')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index fdf45293e9a..a04fdfa0f74 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -51,6 +51,7 @@ struct Curve; struct EditBone; struct EditFace; struct EditMesh; +struct EnvMap; struct ID; struct FCurve; struct ImBuf; @@ -145,6 +146,7 @@ double elbeemEstimateMemreq(int res, float sx, float sy, float sz, int refine, c struct Render *RE_NewRender(const char *name){return (struct Render*) NULL;} void RE_SwapResult(struct Render *re, struct RenderResult **rr){} void RE_BlenderFrame(struct Render *re, struct Scene *scene, int frame){} +int RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, int imtype, float layout[12]) { return 0; } /* rna */ float *give_cursor(struct Scene *scene, struct View3D *v3d){return (float *) NULL;} |