kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* blenderplayer wasnt useing the scenes frame rate.

Browse Source 
* GBE Python API's alignToVect wasnt clamping the align ammount from 0.0-1.0
* Generated images arnt animated - use for a test to see if the textures animated.
This commit is contained in:
Campbell Barton 2008-08-06 04:09:10 +00:00
parent 028d44c075
commit 553e35e36f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/texture.c
View File

@ -850,10 +850,8 @@ int BKE_texture_dependsOnTime(const struct Tex *texture)
if(texture->plugin) {
// assume all plugins depend on time
return 1;
} else if(texture->ima &&
( texture->ima->source == IMA_SRC_SEQUENCE ||
texture->ima->source == IMA_SRC_MOVIE ||
texture->ima->source == IMA_SRC_GENERATED ) ) {
} else if( texture->ima &&
ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
return 1;
} else if(texture->ipo) {
// assume any ipo means the texture is animated

6
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@ -56,6 +56,7 @@ extern "C"
#include "BLO_readfile.h"
#include "BKE_global.h"
#include "BKE_main.h"
#include "DNA_scene_types.h"
#ifdef __cplusplus
}
#endif // __cplusplus
@ -669,6 +670,11 @@ bool GPG_Application::startEngine(void)
m_ketsjiengine->StartEngine(true);
m_engineRunning = true;
// Set the animation playback rate for ipo's and actions
// the framerate below should patch with FPS macro defined in blendef.h
// Could be in StartEngine set the framerate, we need the scene to do this
m_ketsjiengine->SetAnimFrameRate( (((double) G.scene->r.frs_sec) / G.scene->r.frs_sec_base) );
}
if (!m_engineRunning)

3
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@ -1490,6 +1490,9 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self,
MT_Vector3 vect;
if (PyVecTo(pyvect, vect))
{
if (fac<=0.0) Py_RETURN_NONE; // Nothing to do.
if (fac< 1.0) fac= 1.0;
AlignAxisToVect(vect,axis,fac);
NodeUpdateGS(0.f,true);
Py_RETURN_NONE;