[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50620] trunk/blender/source/blender: fix for 3 obvious mistakes/bugs.

[Campbell Barton]

Revision: 50620
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50620
Author:   campbellbarton
Date:     2012-09-15 06:30:40 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
fix for 3 obvious mistakes/bugs.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-09-15 06:29:32 UTC (rev 50619)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2012-09-15 06:30:40 UTC (rev 50620)
@@ -384,7 +384,7 @@
 		}
 	}
 
-	else if (dm->dirty && DM_DIRTY_TESS_CDLAYERS) {
+	else if (dm->dirty & DM_DIRTY_TESS_CDLAYERS) {
 		BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));
 		DM_update_tessface_data(dm);
 	}

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-09-15 06:29:32 UTC (rev 50619)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-09-15 06:30:40 UTC (rev 50620)
@@ -7804,7 +7804,7 @@
 					MovieTrackingMarker *marker = &track->markers[i];
 
 					if (is_zero_v2(marker->pattern_corners[0]) && is_zero_v2(marker->pattern_corners[1]) &&
-					    is_zero_v2(marker->pattern_corners[3]) && is_zero_v2(marker->pattern_corners[3]))
+					    is_zero_v2(marker->pattern_corners[2]) && is_zero_v2(marker->pattern_corners[3]))
 					{
 						marker->pattern_corners[0][0] = track->pat_min[0];
 						marker->pattern_corners[0][1] = track->pat_min[1];

Modified: trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h	2012-09-15 06:29:32 UTC (rev 50619)
+++ trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.h	2012-09-15 06:30:40 UTC (rev 50620)
@@ -99,8 +99,8 @@
 		       this->m_inverted == inverted &&
 		       this->m_width == width &&
 		       this->m_height == height &&
-		       this->m_calibration_width == this->m_calibration_width &&
-		       this->m_calibration_height == this->m_calibration_height;
+		       this->m_calibration_width == calibration_width &&
+		       this->m_calibration_height == claibration_height;
 	}
 	
 	void getUV(MovieTracking *trackingData, int x, int y, float *u, float *v)