diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-27 12:11:05 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-27 12:11:05 +0400 |
| commit | c896fcae7963fb35124ef3fefe0f12679228fa39 (patch) | |
| tree | f4435bd39a36228a71c9142e4c26bacd482683f3 /source/blender/render/extern/include/RE_shader_ext.h | |
| parent | cb12648656fc001e8c4c6d00df73e52d452f8787 (diff) | |
| parent | 93bb6238e0c6b7ea008776f4e1c3958ef5382c09 (diff) | |
Merge with trunk r37849
Diffstat (limited to 'source/blender/render/extern/include/RE_shader_ext.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index ecfc54bc487..8df9e707dc7 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -212,6 +212,6 @@ struct Object; 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); +void RE_bake_ibuf_filter(struct ImBuf *ibuf, char *mask, const int filter); #endif /* RE_SHADER_EXT_H */ |