diff options
3 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp index fe794cb769f..8aa1324d8e2 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp @@ -38,15 +38,16 @@ extern "C" { PlaneTrackMaskOperation::PlaneTrackMaskOperation() : PlaneTrackCommonOperation() { this->addOutputSocket(COM_DT_VALUE); + + /* Currently hardcoded to 8 samples. */ + this->m_osa = 8; } void PlaneTrackMaskOperation::initExecution() { PlaneTrackCommonOperation::initExecution(); - const int osa = 8; - this->m_osa = osa; - BLI_jitter_init(this->m_jitter[0], osa); + BLI_jitter_init(this->m_jitter[0], this->m_osa); } void PlaneTrackMaskOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) diff --git a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp index c90e915fcd5..2385219c656 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp @@ -106,6 +106,9 @@ PlaneTrackWarpImageOperation::PlaneTrackWarpImageOperation() : PlaneTrackCommonO this->addOutputSocket(COM_DT_COLOR); this->m_pixelReader = NULL; this->setComplex(true); + + /* Currently hardcoded to 8 samples. */ + this->m_osa = 8; } void PlaneTrackWarpImageOperation::initExecution() @@ -114,9 +117,7 @@ void PlaneTrackWarpImageOperation::initExecution() this->m_pixelReader = this->getInputSocketReader(0); - const int osa = 8; - this->m_osa = osa; - BLI_jitter_init(this->m_jitter[0], osa); + BLI_jitter_init(this->m_jitter[0], this->m_osa); } void PlaneTrackWarpImageOperation::deinitExecution() diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c index 6ced2423074..9cc1702addb 100644 --- a/source/blender/editors/mask/mask_relationships.c +++ b/source/blender/editors/mask/mask_relationships.c @@ -137,6 +137,7 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op)) sub_parent_name = track->name; parent_type = MASK_PARENT_POINT_TRACK; + memset(orig_corners, 0, sizeof(orig_corners)); } else if ((plane_track = BKE_tracking_plane_track_get_active(tracking)) != NULL) { MovieTrackingPlaneMarker *plane_marker = BKE_tracking_plane_marker_get(plane_track, framenr); |