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

the string 'Environment' is too long for a pass name, was causing crashes in FSA. use Env instead.

Browse Source 
(commit 27536 by Campbell from render25 branch)
This commit is contained in:
Brecht Van Lommel
2010-03-16 18:00:45 +00:00
parent 47a0967a30
commit 2b34078fb2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/source/pipeline.c
View File

@@ -340,10 +340,10 @@ static char *get_pass_name(int passtype, int channel)
return "AO.B";
}
if(passtype == SCE_PASS_ENVIRONMENT) {
if(channel==-1) return "Environment";
if(channel==0) return "Environment.R";
if(channel==1) return "Environment.G";
return "Environment.B";
if(channel==-1) return "Env";
if(channel==0) return "Env.R";
if(channel==1) return "Env.G";
return "Env.B";
}
if(passtype == SCE_PASS_INDIRECT) {
if(channel==-1) return "Indirect";
@@ -417,7 +417,7 @@ static int passtype_from_name(char *str)
if(strcmp(str, "AO")==0)
return SCE_PASS_AO;
if(strcmp(str, "Environment")==0)
if(strcmp(str, "Env")==0)
return SCE_PASS_ENVIRONMENT;
if(strcmp(str, "Indirect")==0)