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

Merged changes in the trunk up to revision 37539.

Browse Source 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.
This commit is contained in:
Tamito Kajiyama
2011-06-16 05:50:13 +00:00
parent 32c7e22d36 2e8ca6d196
commit 17ee056fc6
106 changed files with 1375 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ typedef struct RenderResult {
typedef struct RenderStats {
int cfra;
int totface, totvert, totstrand, tothalo, totlamp, totpart;
short curfield, curblur, curpart, partsdone, convertdone;
short curfield, curblur, curpart, partsdone, convertdone, curfsa;
double starttime, lastframetime;
const char *infostr, *statstr;
char scenename[32];