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

[Campbell Barton]

Revision: 15232
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15232
Author:   campbellbarton
Date:     2008-06-15 11:49:18 +0200 (Sun, 15 Jun 2008)

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

Modified Paths:
--------------
    branches/apricot/source/blender/src/drawaction.c
    branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp

Modified: branches/apricot/source/blender/src/drawaction.c
===================================================================
--- branches/apricot/source/blender/src/drawaction.c    2008-06-15 09:43:24 UTC 
(rev 15231)
+++ branches/apricot/source/blender/src/drawaction.c    2008-06-15 09:49:18 UTC 
(rev 15232)
@@ -730,7 +730,7 @@
                
                for (achan=saction->action->chanbase.first; achan; 
achan=achan->next) {
                        pchan= get_pose_channel(ob->pose, achan->name);
-                       if (pchan) {
+                       if (pchan && pchan->bone) {
                                if ((pchan->bone->layer & arm->layer)==0)
                                        achan->flag |= ACHAN_HIDDEN;
                                else if (pchan->bone->flag & BONE_HIDDEN_P)

Modified: 
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp   
2008-06-15 09:43:24 UTC (rev 15231)
+++ branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp   
2008-06-15 09:49:18 UTC (rev 15232)
@@ -543,7 +543,7 @@
                material->amb                   = mat->amb;
 
                // set alpha testing without z-sorting
-               if( ( validface && (!tface->transp)) && mat->mode & MA_ZTRA) {
+               if( ( validface && (!(tface->transp &~ TF_CLIP))) && mat->mode 
& MA_ZTRA) {
                        // sets the RAS_IPolyMaterial::m_flag |RAS_FORCEALPHA
                        // this is so we don't have the overhead of the 
z-sorting code
                        material->ras_mode|=ALPHA_TEST;
@@ -599,7 +599,7 @@
                material->ras_mode |= ( (tface->mode & TF_DYNAMIC)!= 0 
)?COLLIDER:0;
                material->transp = tface->transp;
                
-               if(tface->transp)
+               if(tface->transp&~TF_CLIP)
                        material->ras_mode |= TRANSP;
 
                material->tile  = tface->tile;
@@ -950,7 +950,7 @@
                                                // Use texface colors if 
available
                                                //TF_DYNAMIC means the polygon 
is a collision face
                                                collider = ((tface->mode & 
TF_DYNAMIC) != 0);
-                                               transp = tface->transp;
+                                               transp = tface->transp &~ 
TF_CLIP;
                                                tile = tface->tile;
                                                mode = tface->mode;
                                                

Modified: branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp    
2008-06-15 09:43:24 UTC (rev 15231)
+++ branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp    
2008-06-15 09:49:18 UTC (rev 15232)
@@ -580,7 +580,7 @@
                glDisable(GL_BLEND); 
                glEnable ( GL_ALPHA_TEST );
                glAlphaFunc(GL_GREATER, 0.5f);
-               return true;
+               return false;
        }
        return false;
 }


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