Merged changes in the trunk up to revision 30952.
This commit is contained in:
@@ -37,14 +37,15 @@
|
||||
|
||||
struct bNodeTree;
|
||||
struct Image;
|
||||
struct Main;
|
||||
struct NodeBlurData;
|
||||
struct Object;
|
||||
struct ReportList;
|
||||
struct RenderData;
|
||||
struct RenderEngine;
|
||||
struct RenderEngineType;
|
||||
struct RenderResult;
|
||||
struct ReportList;
|
||||
struct ReportList;
|
||||
struct Scene;
|
||||
struct SceneRenderLayer;
|
||||
|
||||
@@ -208,12 +209,12 @@ void RE_init_threadcount(Render *re);
|
||||
void RE_TileProcessor(struct Render *re);
|
||||
|
||||
/* only RE_NewRender() needed, main Blender render calls */
|
||||
void RE_BlenderFrame(struct Render *re, struct Scene *scene, struct SceneRenderLayer *srl, unsigned int lay, int frame);
|
||||
void RE_BlenderAnim(struct Render *re, struct Scene *scene, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
|
||||
void RE_RenderFreestyleStrokes(struct Render *re, struct Scene *scene);
|
||||
void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, unsigned int lay, int frame);
|
||||
void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, unsigned int lay, int sfra, int efra, int tfra, struct ReportList *reports);
|
||||
void RE_RenderFreestyleStrokes(struct Render *re, struct Main *bmain, struct Scene *scene);
|
||||
|
||||
/* main preview render call */
|
||||
void RE_PreviewRender(struct Render *re, struct Scene *scene);
|
||||
void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene);
|
||||
|
||||
void RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode);
|
||||
void RE_WriteRenderResult(RenderResult *rr, char *filename, int compress);
|
||||
@@ -249,7 +250,7 @@ void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize,
|
||||
#define RE_BAKE_DISPLACEMENT 5
|
||||
#define RE_BAKE_SHADOW 6
|
||||
|
||||
void RE_Database_Baking(struct Render *re, struct Scene *scene, unsigned int lay, int type, struct Object *actob);
|
||||
void RE_Database_Baking(struct Render *re, struct Main *bmain, struct Scene *scene, unsigned int lay, int type, struct Object *actob);
|
||||
|
||||
void RE_DataBase_GetView(struct Render *re, float mat[][4]);
|
||||
void RE_GetCameraWindow(struct Render *re, struct Object *camera, int frame, float mat[][4]);
|
||||
|
||||
Reference in New Issue
Block a user