← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_BlenderMaterial.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
157
157
        return mMaterial->material;
158
158
}
159
159
 
 
160
Image *KX_BlenderMaterial::GetBlenderImage() const
 
161
{
 
162
        return mMaterial->tface.tpage;
 
163
}
 
164
 
160
165
Scene* KX_BlenderMaterial::GetBlenderScene() const
161
166
{
162
167
        return mScene->GetBlenderScene();
803
808
void KX_BlenderMaterial::Replace_IScene(SCA_IScene *val)
804
809
{
805
810
        mScene= static_cast<KX_Scene *>(val);
806
 
        if (mBlenderShader)
807
 
                mBlenderShader->SetScene(mScene);
808
 
        
 
811
 
809
812
        OnConstruction();
810
813
}
811
814