← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_Light.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_Light.cpp
48
48
#include "DNA_scene_types.h"
49
49
#include "DNA_lamp_types.h"
50
50
#include "GPU_material.h"
 
51
 
 
52
#include "BKE_scene.h"
 
53
#include "MEM_guardedalloc.h"
51
54
 
52
55
KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
53
56
                               class RAS_IRenderTools* rendertools,
62
65
        m_rendertools->AddLight(&m_lightobj);
63
66
        m_glsl = glsl;
64
67
        m_blenderscene = ((KX_Scene*)sgReplicationInfo)->GetBlenderScene();
 
68
        m_base = NULL;
65
69
};
66
70
 
67
71
 
78
82
        }
79
83
 
80
84
        m_rendertools->RemoveLight(&m_lightobj);
 
85
 
 
86
        if (m_base) {
 
87
                BKE_scene_base_unlink(m_blenderscene, m_base);
 
88
                MEM_freeN(m_base);
 
89
        }
81
90
}
82
91
 
83
92
 
216
225
        }
217
226
}
218
227
 
 
228
void KX_LightObject::UpdateScene(KX_Scene *kxscene)
 
229
{
 
230
        m_lightobj.m_scene = (void*)kxscene;
 
231
        m_blenderscene = kxscene->GetBlenderScene();
 
232
        m_base = BKE_scene_base_add(m_blenderscene, GetBlenderObject());
 
233
}
 
234
 
219
235
bool KX_LightObject::HasShadowBuffer()
220
236
{
221
237
        GPULamp *lamp;