Revision: 60741
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60741
Author:   campbellbarton
Date:     2013-10-14 07:15:59 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
code cleanup: remove duplicate assignments

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c  2013-10-14 
07:10:38 UTC (rev 60740)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c  2013-10-14 
07:15:59 UTC (rev 60741)
@@ -1854,7 +1854,6 @@
        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;
 

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c        
2013-10-14 07:10:38 UTC (rev 60740)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c        
2013-10-14 07:15:59 UTC (rev 60741)
@@ -3183,9 +3183,6 @@
        /* 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;

Modified: 
trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp 
2013-10-14 07:10:38 UTC (rev 60740)
+++ trunk/blender/source/blender/compositor/operations/COM_InpaintOperation.cpp 
2013-10-14 07:15:59 UTC (rev 60741)
@@ -48,7 +48,6 @@
 {
        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;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to