Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-04-17 19:47:00 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-04-17 19:47:00 +0400
commit392e1da1790d252f0f156379c1d5507959a4e17a (patch)
tree815d4055f1baada104f9843b05cd87b60b5c0fa2 /source/gameengine/Converter
parent3afd8d6cc859255d0b52081fbee91b6c6a012b4c (diff)
bugfix and cleanup
- BGE Shader.setSampler(name, index): index range check was wrong. - Compositor check for an invalid channel was incorrect. - getting the center of selected verts used an uninitalized z axis. - do_init_render_material() used && rather then & when testing for MA_TRANSP. - weight paint activate flipped bone used && rather then & for flag checking.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_ArmatureConstraint.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.cpp b/source/gameengine/Converter/BL_ArmatureConstraint.cpp
index f9455d37622..7117ba61037 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.cpp
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.cpp
@@ -74,7 +74,7 @@ BL_ArmatureConstraint::BL_ArmatureConstraint(
bConstraint *constraint,
KX_GameObject* target,
KX_GameObject* subtarget)
- : PyObjectPlus(), m_armature(armature), m_constraint(constraint), m_posechannel(posechannel)
+ : PyObjectPlus(), m_constraint(constraint), m_posechannel(posechannel), m_armature(armature)
{
m_target = target;
m_blendtarget = (target) ? target->GetBlenderObject() : NULL;