[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29041] branches/render25/source: Fix indexMat typo and linking problem on Linux with make.

[Diego Borghetti]

Revision: 29041
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29041
Author:   bdiego
Date:     2010-05-28 06:28:11 +0200 (Fri, 28 May 2010)

Log Message:
-----------
Fix indexMat typo and linking problem on Linux with make.

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

Modified: branches/render25/source/Makefile
===================================================================
--- branches/render25/source/Makefile	2010-05-28 03:12:01 UTC (rev 29040)
+++ branches/render25/source/Makefile	2010-05-28 04:28:11 UTC (rev 29041)
@@ -120,6 +120,7 @@
 COMLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
 COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
 COMLIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a
+COMLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
 
 ifeq ($(WITH_FFMPEG),true)
     COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a

Modified: branches/render25/source/blender/render/intern/source/result.c
===================================================================
--- branches/render25/source/blender/render/intern/source/result.c	2010-05-28 03:12:01 UTC (rev 29040)
+++ branches/render25/source/blender/render/intern/source/result.c	2010-05-28 04:28:11 UTC (rev 29041)
@@ -773,7 +773,7 @@
 	if(strcmp(str, "IndexOB")==0)
 		return SCE_PASS_INDEXOB;
 
-	if(strcmp(str, "IndexOB")==0)
+	if(strcmp(str, "IndexMA")==0)
 		return SCE_PASS_INDEXMA;
 
 	if(strcmp(str, "Mist")==0)