diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 10:30:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 10:30:40 +0400 |
| commit | 19863a72688381d2ef3422d7c974054ffd618380 (patch) | |
| tree | bff30b1e5e32bc704514e4fb8bbb5b9a680024c5 /source | |
| parent | 77ed2d8ca9af8bb646ceb56f47e7a9e21d1eaaee (diff) | |
fix for 3 obvious mistakes/bugs.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_MovieDistortionOperation.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 8c0aea5723f..07d14513bd0 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -384,7 +384,7 @@ void DM_ensure_tessface(DerivedMesh *dm) } } - 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); } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3935546bf58..a7f8026ad5d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7804,7 +7804,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) 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]; diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 7e62de7b9f1..f3eeb2f48ba 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -99,8 +99,8 @@ public: 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) |