bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix warnings reported by cavity checker

Browse Source
This commit is contained in:
Sergey Sharybin 2013-08-19 07:32:47 +00:00
parent f008a4c551
commit 1dc19975c0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
View File

@ -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)

7
source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
View File

@ -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()

1
source/blender/editors/mask/mask_relationships.c
View File

@ -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);