[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15866] branches/apricot/source: svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Campbell Barton]

Revision: 15866
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15866
Author:   campbellbarton
Date:     2008-07-29 17:27:03 +0200 (Tue, 29 Jul 2008)

Log Message:
-----------
svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/apricot/source/blender/blenlib/intern/freetypefont.c
    branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp

Modified: branches/apricot/source/blender/blenlib/intern/freetypefont.c
===================================================================
--- branches/apricot/source/blender/blenlib/intern/freetypefont.c	2008-07-29 12:26:50 UTC (rev 15865)
+++ branches/apricot/source/blender/blenlib/intern/freetypefont.c	2008-07-29 15:27:03 UTC (rev 15866)
@@ -405,7 +405,7 @@
 		lcode = charcode;
 	}
 	
-	err = FT_Set_Charmap( face, (FT_CharMap) FT_ENCODING_UNICODE );
+	err = FT_Select_Charmap( face, FT_ENCODING_UNICODE );
 
 	return vfd;	
 }

Modified: branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp	2008-07-29 12:26:50 UTC (rev 15865)
+++ branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp	2008-07-29 15:27:03 UTC (rev 15866)
@@ -658,7 +658,7 @@
 			// Should not happen as dupli group are created automatically 
 			continue;
 		}
-		if (blenderobj->lay & group->layer==0)
+		if ((blenderobj->lay & group->layer)==0)
 		{
 			// object is not visible in the 3D view, will not be instantiated
 			continue;