[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23176] trunk/blender/source: svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2. 4 -r23172:HEAD

[Campbell Barton]

Revision: 23176
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23176
Author:   campbellbarton
Date:     2009-09-13 10:50:54 +0200 (Sun, 13 Sep 2009)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172:HEAD

merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged.

brings 2.4 and trunk in sync aside from sequencer edits from Peter.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/jp2.c
    trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
    trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h

Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c	2009-09-13 08:41:13 UTC (rev 23175)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c	2009-09-13 08:50:54 UTC (rev 23176)
@@ -230,7 +230,7 @@
 				rect_float[2]= (float)(image->comps[2].data[index] + signed_offsets[2]) / float_divs[2];
 				
 				if (image->numcomps >= 4)
-					rect_float[3]= (float)(image->comps[2].data[index] + signed_offsets[3]) / float_divs[3];
+					rect_float[3]= (float)(image->comps[3].data[index] + signed_offsets[3]) / float_divs[3];
 				else
 					rect_float[3]= 1.0f;
 			}
@@ -260,7 +260,7 @@
 				rect[2]= image->comps[2].data[index] + signed_offsets[2];
 				
 				if (image->numcomps >= 4)
-					rect[3]= image->comps[2].data[index] + signed_offsets[3];
+					rect[3]= image->comps[3].data[index] + signed_offsets[3];
 				else
 					rect[3]= 255;
 			}

Modified: trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp	2009-09-13 08:41:13 UTC (rev 23175)
+++ trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp	2009-09-13 08:50:54 UTC (rev 23176)
@@ -142,6 +142,22 @@
 		delete m_client_info;
 }
 
+void KX_NearSensor::SetPhysCtrlRadius()
+{
+	if (m_bTriggered)
+	{
+		if (m_physCtrl)
+		{
+			m_physCtrl->SetRadius(m_ResetMargin);
+		}
+	} else
+	{
+		if (m_physCtrl)
+		{
+			m_physCtrl->SetRadius(m_Margin);
+		}
+	}
+}
 
 bool KX_NearSensor::Evaluate()
 {
@@ -151,20 +167,9 @@
 	if (m_bTriggered != m_bLastTriggered)
 	{
 		m_bLastTriggered = m_bTriggered;
-		if (m_bTriggered)
-		{
-			if (m_physCtrl)
-			{
-				m_physCtrl->SetRadius(m_ResetMargin);
-			}
-		} else
-		{
-			if (m_physCtrl)
-			{
-				m_physCtrl->SetRadius(m_Margin);
-			}
-
-		}
+		
+		SetPhysCtrlRadius();
+		
 		result = true;
 	}
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h	2009-09-13 08:41:13 UTC (rev 23175)
+++ trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h	2009-09-13 08:50:54 UTC (rev 23176)
@@ -68,6 +68,7 @@
 	virtual void SynchronizeTransform();
 	virtual CValue* GetReplica();
 	virtual void ProcessReplica();
+	virtual void SetPhysCtrlRadius();
 	virtual bool Evaluate();
 
 	virtual void ReParent(SCA_IObject* parent);
@@ -91,6 +92,8 @@
 		if (sensor->m_Margin > sensor->m_ResetMargin)
 			sensor->m_ResetMargin = sensor->m_Margin;
 
+		sensor->SetPhysCtrlRadius();
+			
 		return 0;
 	}