[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27556] trunk/blender/source/blender/ render/intern/source/pipeline.c: the string 'Environment' is too long for a pass name, was causing crashes in FSA.
Brecht Van Lommel
brecht at blender.org
Tue Mar 16 19:00:45 CET 2010
Revision: 27556
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27556
Author: blendix
Date: 2010-03-16 19:00:45 +0100 (Tue, 16 Mar 2010)
Log Message:
-----------
the string 'Environment' is too long for a pass name, was causing crashes in FSA. use Env instead.
(commit 27536 by Campbell from render25 branch)
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c 2010-03-16 17:59:39 UTC (rev 27555)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c 2010-03-16 18:00:45 UTC (rev 27556)
@@ -340,10 +340,10 @@
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 @@
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)
More information about the Bf-blender-cvs
mailing list