← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_SceneActuator.h

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_SceneActuator.h
2
2
//
3
3
// Add object to the game world on action of this actuator
4
4
//
5
 
// $Id: KX_SceneActuator.h 14444 2008-04-16 22:40:48Z hos $
 
5
// $Id: KX_SceneActuator.h 15638 2008-07-19 07:45:19Z ben2610 $
6
6
//
7
7
// ***** BEGIN GPL LICENSE BLOCK *****
8
8
//
82
82
        virtual ~KX_SceneActuator();
83
83
 
84
84
        virtual CValue* GetReplica();
 
85
        virtual void ProcessReplica();
 
86
        virtual bool UnlinkObject(SCA_IObject* clientobj);
 
87
        virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
85
88
 
86
89
        virtual bool Update();
87
90