diff options
author | Martin Poirier <theeth@yahoo.com> | 2008-10-04 03:36:02 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2008-10-04 03:36:02 +0400 |
commit | 1513e96857538a5a686439247c0608bd1dfce64a (patch) | |
tree | 0af1fbba8204b258ad9466278c27f439acbaa5c0 | |
parent | c35a2d6ea9dc5226911bd90848e96a59233bdaf8 (diff) |
fix conflict in merged file. weird, it compiled ok wednesday.
-rw-r--r-- | source/gameengine/Converter/BL_ShapeActionActuator.cpp | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp index cbaa8668b26..46f3141be29 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp +++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp @@ -1,98 +1,3 @@ -<<<<<<< .working -/** -* $Id:BL_ShapeActionActuator.cpp 15330 2008-06-23 16:37:51Z theeth $ -* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** -*/ - -#if defined (__sgi) -#include <math.h> -#else -#include <cmath> -#endif - -#include "SCA_LogicManager.h" -#include "BL_ShapeActionActuator.h" -#include "BL_ActionActuator.h" -#include "BL_ShapeDeformer.h" -#include "KX_GameObject.h" -#include "STR_HashedString.h" -#include "DNA_action_types.h" -#include "DNA_nla_types.h" -#include "DNA_actuator_types.h" -#include "BKE_action.h" -#include "DNA_armature_types.h" -#include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_arithb.h" -#include "MT_Matrix4x4.h" -#include "BKE_utildefines.h" - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -BL_ShapeActionActuator::~BL_ShapeActionActuator() -{ -} - -void BL_ShapeActionActuator::ProcessReplica() -{ - m_localtime=m_startframe; - m_lastUpdate=-1; -} - -void BL_ShapeActionActuator::SetBlendTime (float newtime) -{ - m_blendframe = newtime; -} - -CValue* BL_ShapeActionActuator::GetReplica() -{ - BL_ShapeActionActuator* replica = new BL_ShapeActionActuator(*this);//m_float,GetName()); - replica->ProcessReplica(); - - // this will copy properties and so on... - CValue::AddDataToReplica(replica); - return replica; -} - -bool BL_ShapeActionActuator::ClampLocalTime() -{ - if (m_startframe < m_endframe) { - if (m_localtime < m_startframe) - { - m_localtime = m_startframe; - return true; - } - else if (m_localtime > m_endframe) - { - m_localtime = m_endframe; - return true; -======= /** * $Id$ * @@ -447,7 +352,6 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame) oldprop->SetValue(newval); } else { propowner->SetProperty(m_framepropname, newval); ->>>>>>> .merge-right.r16886 } newval->Release(); } |