[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27536] branches/render25/source/blender/ render/intern/source/result.c: the string 'Environment' is too long for a pass name, was causing crashes in FSA.

[Campbell Barton]

Revision: 27536
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27536
Author:   campbellbarton
Date:     2010-03-16 14:22:27 +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.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/result.c

Modified: branches/render25/source/blender/render/intern/source/result.c
===================================================================
--- branches/render25/source/blender/render/intern/source/result.c      
2010-03-16 12:55:56 UTC (rev 27535)
+++ branches/render25/source/blender/render/intern/source/result.c      
2010-03-16 13:22:27 UTC (rev 27536)
@@ -665,10 +665,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";
@@ -742,7 +742,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)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs