← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/blender/intrepid-updates

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ActionActuator.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-08-08 02:45:40 UTC
  • mfrom: (12.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080808024540-kkjp7ekfivzhuw3l
Tags: 2.46+dfsg-4
http://bugs.debian.org/492280
* Fix python syntax warning in import_dxf.py, which led to nasty output
  in installation/upgrade logs during byte-compilation, using a patch
  provided by the script author (Closes: #492280):
   - debian/patches/45_fix_python_syntax_warning

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Converter/BL_ActionActuator.cpp
1
1
/**
2
 
* $Id: BL_ActionActuator.cpp,v 1.17 2006/04/28 17:35:03 erwin Exp $
 
2
* $Id: BL_ActionActuator.cpp 14444 2008-04-16 22:40:48Z hos $
3
3
*
4
 
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
 
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
6
6
 * This program is free software; you can redistribute it and/or
7
7
 * modify it under the terms of the GNU General Public License
8
8
 * as published by the Free Software Foundation; either version 2
9
 
 * of the License, or (at your option) any later version. The Blender
10
 
 * Foundation also sells licenses for use in proprietary software under
11
 
 * the Blender License.  See http://www.blender.org/BL/ for information
12
 
 * about this.
 
9
 * of the License, or (at your option) any later version.
13
10
 *
14
11
 * This program is distributed in the hope that it will be useful,
15
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
27
24
 *
28
25
 * Contributor(s): none yet.
29
26
 *
30
 
 * ***** END GPL/BL DUAL LICENSE BLOCK *****
 
27
 * ***** END GPL LICENSE BLOCK *****
31
28
*/
32
29
 
33
30
#if defined (__sgi)
43
40
#include "KX_GameObject.h"
44
41
#include "STR_HashedString.h"
45
42
#include "DNA_action_types.h"
 
43
#include "DNA_nla_types.h"
46
44
#include "DNA_actuator_types.h"
47
45
#include "BKE_action.h"
48
46
#include "DNA_armature_types.h"
384
382
                                
385
383
                                /* Find percentages */
386
384
                                newweight = (m_blendframe/(float)m_blendin);
387
 
                                blend_poses(m_pose, m_blendpose, 1.0 - newweight, POSE_BLEND);
 
385
                                blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
388
386
 
389
387
                                /* Increment current blending percentage */
390
388
                                m_blendframe = (curtime - m_blendstart)*KX_FIXED_FRAME_PER_SEC;