diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 00:59:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 00:59:09 +0400 |
| commit | 1b142434055e2b56b23991f0c9d695b6d4f33390 (patch) | |
| tree | 8689574221e0d98697af406292b0383c14fc0c3b /source/gameengine/BlenderRoutines | |
| parent | dff9dce1cdcb5250797f529456649510d2396096 (diff) | |
| parent | 1c00eacca2b084d7189de33cb75e8612cb542030 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899
missing commits from peter 20942, 21165, 21170, 21174, 21597
these files still need manual merging
source/blender/makesdna/DNA_sequence_types.h
source/blender/src/sequence.c
source/blender/src/seqeffects.c
source/blender/src/editseq.c
source/blender/include/BSE_sequence.h
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index ffff7185fe4..8ed36e860b4 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -261,6 +261,12 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat // couldn't find something to cast the shadow on... glMultMatrixd(oglmatrix); } + else + { // we found the "ground", but the cast matrix doesn't take + // scaling in consideration, so we must apply the object scale + MT_Vector3 size = gameobj->GetSGNode()->GetLocalScale(); + glScalef(size[0], size[1], size[2]); + } } else { @@ -384,5 +390,4 @@ void KX_BlenderRenderTools::Update2DFilter(vector<STR_String>& propNames, void* void KX_BlenderRenderTools::Render2DFilters(RAS_ICanvas* canvas) { m_filtermanager.RenderFilters(canvas); -} - +}
\ No newline at end of file |