forked from bartvdbraak/blender
- correct --help message
- fix implicit decloration of DAG_scene_sort() - same fix for tiff as made in renderbranch - rename 'combined peak' --> 'peak' for shorter messages while rendering.
This commit is contained in:
parent
6c01b7b4f8
commit
4178b44b35
@ -479,7 +479,7 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
|
||||
spos+= sprintf(spos, "Fra:%d Ve:%d Fa:%d ", (scene->r.cfra), rs->totvert, rs->totface);
|
||||
if(rs->tothalo) spos+= sprintf(spos, "Ha:%d ", rs->tothalo);
|
||||
if(rs->totstrand) spos+= sprintf(spos, "St:%d ", rs->totstrand);
|
||||
spos+= sprintf(spos, "La:%d Mem:%.2fM (%.2fM, combined peak %.2fM) ", rs->totlamp, megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
spos+= sprintf(spos, "La:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->totlamp, megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
|
||||
if(rs->curfield)
|
||||
spos+= sprintf(spos, "Field %d ", rs->curfield);
|
||||
|
@ -62,6 +62,7 @@
|
||||
BLI_countlist BLI_stringdec */
|
||||
#include "DNA_userdef_types.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
|
||||
#include "imbuf.h"
|
||||
|
||||
|
@ -594,7 +594,6 @@ ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags)
|
||||
|
||||
hbuf= IMB_allocImBuf(width, height, 32, 0, 0);
|
||||
hbuf->miplevel= level;
|
||||
hbuf->flags |= IB_tilecache;
|
||||
hbuf->ftype= ibuf->ftype;
|
||||
ibuf->mipmap[level-1] = hbuf;
|
||||
|
||||
@ -604,6 +603,8 @@ ImBuf *imb_loadtiff(unsigned char *mem, int size, int flags)
|
||||
else
|
||||
hbuf= ibuf;
|
||||
|
||||
hbuf->flags |= IB_tilecache;
|
||||
|
||||
TIFFGetField(image, TIFFTAG_TILEWIDTH, &hbuf->tilex);
|
||||
TIFFGetField(image, TIFFTAG_TILELENGTH, &hbuf->tiley);
|
||||
|
||||
|
@ -149,7 +149,7 @@ static void stats_background(void *unused, RenderStats *rs)
|
||||
mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
|
||||
megs_peak_memory = (peak_memory)/(1024.0*1024.0);
|
||||
|
||||
spos+= sprintf(spos, "Fra:%d Mem:%.2fM (%.2fM, combined peak %.2fM) ", rs->cfra,
|
||||
spos+= sprintf(spos, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
|
||||
megs_used_memory, mmap_used_memory, megs_peak_memory);
|
||||
|
||||
if(rs->curfield)
|
||||
|
@ -228,7 +228,7 @@ static int print_help(int argc, char **argv, void *data)
|
||||
printf (" When the filename does not contain #, The suffix #### is added to the filename\n");
|
||||
printf (" The frame number will be added at the end of the filename.\n");
|
||||
printf (" eg: blender -b foobar.blend -o //render_ -F PNG -x 1 -a\n");
|
||||
printf (" test-######.png becomes test-000001.png\n\n");
|
||||
printf (" //render_ becomes //render_####, writing frames as //render_0001.png//\n");
|
||||
|
||||
printf (" -E or --engine <engine>\n");
|
||||
printf (" Specify the render engine.\n");
|
||||
|
Loading…
Reference in New Issue
Block a user