diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 16:00:03 +0400 |
| commit | b937a4f5b6adc6bc0dca62cb5c87db08c873cfba (patch) | |
| tree | f489aca8e10e2a686fc1d1397397f99e1e1f2077 /source/blender/render/extern | |
| parent | 3de22dec26606c2c526f7193db038fa5125f9b03 (diff) | |
| parent | f227c4a064d96909243b4a60a7f6c544f521817a (diff) | |
Merge with trunk r37546
Diffstat (limited to 'source/blender/render/extern')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 | ||||
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 47230ab3089..23f301249ba 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -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]; diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 74fc161f262..ecfc54bc487 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -193,6 +193,8 @@ typedef struct ShadeInput /* node shaders... */ struct Tex; struct MTex; +struct ImBuf; + /* this one uses nodes */ int multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres); /* nodes disabled */ @@ -208,9 +210,8 @@ struct Render; struct Image; struct Object; -void RE_shade_external(struct Render *re, struct ShadeInput *shi, struct ShadeResult *shr); int RE_bake_shade_all_selected(struct Render *re, int type, struct Object *actob, short *do_update, float *progress); struct Image *RE_bake_shade_get_image(void); +void RE_bake_ibuf_filter(struct ImBuf *ibuf, unsigned char *mask, const int filter); #endif /* RE_SHADER_EXT_H */ - |