diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-14 11:15:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-14 11:15:59 +0400 |
| commit | 52296b941ebd06e24393bc0c913044b7705c6be7 (patch) | |
| tree | bf67a2c998c85a754a0315ffe8511599f56a9be6 /source | |
| parent | 78de5efec1a7a4581c22ae8e3e777cd354a0f054 (diff) | |
code cleanup: remove duplicate assignments
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 3 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_InpaintOperation.cpp | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index dd7e847feaf..925355d9383 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1854,7 +1854,6 @@ void BKE_sequencer_color_balance_apply(StripColorBalance *cb, ImBuf *ibuf, float init_data.cb = cb; init_data.ibuf = ibuf; init_data.mul = mul; - init_data.mask = NULL; init_data.make_float = make_float; init_data.mask = mask_input; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 9a38a5f87b8..ac11a012347 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -3183,9 +3183,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, /* reuse of ccgDM_getNumTessFaces is intentional here: subsurf polys are just created from tessfaces */ ccgdm->dm.getNumPolys = ccgDM_getNumTessFaces; - ccgdm->dm.getNumGrids = ccgDM_getNumGrids; - ccgdm->dm.getPBVH = ccgDM_getPBVH; - ccgdm->dm.getVert = ccgDM_getFinalVert; ccgdm->dm.getEdge = ccgDM_getFinalEdge; ccgdm->dm.getTessFace = ccgDM_getFinalFace; diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cpp b/source/blender/compositor/operations/COM_InpaintOperation.cpp index edcd1563e03..b64c98be0c7 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cpp +++ b/source/blender/compositor/operations/COM_InpaintOperation.cpp @@ -48,7 +48,6 @@ void InpaintSimpleOperation::initExecution() { this->m_inputImageProgram = this->getInputSocketReader(0); - this->m_cached_buffer = NULL; this->m_pixelorder = NULL; this->m_manhatten_distance = NULL; this->m_cached_buffer = NULL; |