Revision: 16531 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16531 Author: blendix Date: 2008-09-15 02:57:11 +0200 (Mon, 15 Sep 2008)
Log Message: ----------- Fix for bug #17620: the motion blur actuator did not work correct with an always sensor, it kept resettting the motion blur each frame. Modified Paths: -------------- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp =================================================================== --- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2008-09-15 00:34:43 UTC (rev 16530) +++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2008-09-15 00:57:11 UTC (rev 16531) @@ -23,8 +23,8 @@ : SCA_IActuator(gameobj, T), m_type(type), m_flag(flag), - m_int_arg(int_arg), m_float_arg(float_arg), + m_int_arg(int_arg), m_rasterizer(rasterizer), m_rendertools(rendertools) { @@ -64,13 +64,11 @@ if( m_type == RAS_2DFilterManager::RAS_2DFILTER_MOTIONBLUR ) { if(!m_flag) - { m_rasterizer->EnableMotionBlur(m_float_arg); - } else - { m_rasterizer->DisableMotionBlur(); - } + + return false; } else if(m_type < RAS_2DFilterManager::RAS_2DFILTER_NUMBER_OF_FILTERS) { Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp =================================================================== --- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp 2008-09-15 00:34:43 UTC (rev 16530) +++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp 2008-09-15 00:57:11 UTC (rev 16531) @@ -949,7 +949,10 @@ void RAS_OpenGLRasterizer::EnableMotionBlur(float motionblurvalue) { - m_motionblur = 1; + /* don't just set m_motionblur to 1, but check if it is 0 so + * we don't reset a motion blur that is already enabled */ + if(m_motionblur == 0) + m_motionblur = 1; m_motionblurvalue = motionblurvalue; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs