Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Merge trunk up to r39790.

Browse Source 
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
This commit is contained in:
Joerg Mueller
2011-08-30 08:22:03 +00:00
parent 5b5e600db6 d049a722fe
commit 43ab8e8624
180 changed files with 6289 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@@ -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;}