← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
254
254
{
255
255
        bool dolights = false;
256
256
 
257
 
        if (m_flag & RAS_BLENDERMAT)
258
 
                dolights = (m_flag &RAS_MULTILIGHT)!=0;
259
 
        else if (rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID);
260
 
        else if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW);
261
 
        else
 
257
        if (m_flag & RAS_BLENDERMAT) {
 
258
                dolights = (m_flag & RAS_MULTILIGHT) != 0;
 
259
        }
 
260
        else if (rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) {
 
261
                /* pass */
 
262
        }
 
263
        else if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW) {
 
264
                /* pass */
 
265
        }
 
266
        else {
262
267
                dolights = m_light;
 
268
        }
263
269
        
264
270
        return dolights;
265
271
}