archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 51718.

Browse Source 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
This commit is contained in:
Tamito Kajiyama
2012-10-29 01:09:12 +00:00
parent 5acd5d1497 dd106b5c7a
commit 15ed834343
1082 changed files with 18699 additions and 18608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/extern/include/RE_pipeline.h vendored
View File

@@ -83,7 +83,7 @@ typedef struct RenderLayer {
/* copy of RenderData */
char name[RE_MAXNAME];
unsigned int lay, lay_zmask, lay_exclude;
int layflag, passflag, pass_xor;
int layflag, passflag, pass_xor;
struct Material *mat_override;
struct Group *light_override;
@@ -236,7 +236,7 @@ void RE_MergeFullSample(struct Render *re, struct Main *bmain, struct Scene *sce
/* ancient stars function... go away! */
void RE_make_stars(struct Render *re, struct Scene *scenev3d, void (*initfunc)(void),
void (*vertexfunc)(float*), void (*termfunc)(void));
void (*vertexfunc)(float *), void (*termfunc)(void));
/* display and event callbacks */
void RE_display_init_cb (struct Render *re, void *handle, void (*f)(void *handle, RenderResult *rr));