sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix blender internal showing SSS preprocessing status message even if there isn't

Browse Source 
any SSS material in the scene.
This commit is contained in:
Brecht Van Lommel 2013-06-13 18:29:56 +00:00
parent 8b2c5e693c
commit 14cc35d1ab
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/render/intern/source/sss.c
View File

@ -993,26 +993,45 @@ static void sss_free_tree(SSSData *sss)
void make_sss_tree(Render *re) void make_sss_tree(Render *re)
{ {
Material *mat; Material *mat;
bool infostr_set = false;
const char *prevstr = NULL;
free_sss(re); free_sss(re);
re->sss_hash= BLI_ghash_ptr_new("make_sss_tree gh"); re->sss_hash= BLI_ghash_ptr_new("make_sss_tree gh");
re->i.infostr = IFACE_("SSS preprocessing");
re->stats_draw(re->sdh, &re->i); re->stats_draw(re->sdh, &re->i);
for (mat= re->main->mat.first; mat; mat= mat->id.next) for (mat= re->main->mat.first; mat; mat= mat->id.next) {
if (mat->id.us && (mat->flag & MA_IS_USED) && (mat->sss_flag & MA_DIFF_SSS)) if (mat->id.us && (mat->flag & MA_IS_USED) && (mat->sss_flag & MA_DIFF_SSS)) {
if (!infostr_set) {
prevstr = re->i.infostr;
re->i.infostr = IFACE_("SSS preprocessing");
infostr_set = true;
}
sss_create_tree_mat(re, mat); sss_create_tree_mat(re, mat);
}
}
/* XXX preview exception */ /* XXX preview exception */
/* localizing preview render data is not fun for node trees :( */ /* localizing preview render data is not fun for node trees :( */
if (re->main!=G.main) { if (re->main!=G.main) {
for (mat= G.main->mat.first; mat; mat= mat->id.next) for (mat= G.main->mat.first; mat; mat= mat->id.next) {
if (mat->id.us && (mat->flag & MA_IS_USED) && (mat->sss_flag & MA_DIFF_SSS)) if (mat->id.us && (mat->flag & MA_IS_USED) && (mat->sss_flag & MA_DIFF_SSS)) {
if (!infostr_set) {
prevstr = re->i.infostr;
re->i.infostr = IFACE_("SSS preprocessing");
infostr_set = true;
}
sss_create_tree_mat(re, mat); sss_create_tree_mat(re, mat);
}
}
} }
if (infostr_set)
re->i.infostr = prevstr;
} }
void free_sss(Render *re) void free_sss(Render *re)