diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-08 09:36:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-08 09:36:05 +0400 |
| commit | ee84084f990da866c15a7b24e7c5945050c4a720 (patch) | |
| tree | 4745614f51b378f3c5ba5a8ef84433b81a86e39b /source | |
| parent | e61339a76fe346f9d9bd45c01f60aa93506eee42 (diff) | |
style cleanup: pep8 + picky edits
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 75636ab5c23..5ca2e876e28 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -3012,7 +3012,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, has_edge_origindex = CustomData_has_layer(&ccgdm->dm.edgeData, CD_ORIGINDEX); - faceNum = 0; + loopindex = loopindex2 = 0; //current loop index for (index = 0; index < totface; index++) { CCGFace *f = ccgdm->faceMap[index].face; diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 76019f01030..d69ecbe325b 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -103,6 +103,7 @@ set(SRC BLI_dynlib.h BLI_dynstr.h BLI_edgehash.h + BLI_editVert.h BLI_fileops.h BLI_fileops_types.h BLI_fnmatch.h diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 73e7bbc6e90..aad6530f049 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1562,7 +1562,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D for (track= tracksbase->first; track; track= track->next) { int selected= TRACK_SELECTED(track); - if ((draw_selected && !selected) || (draw_selected && !selected)) + if (draw_selected && !selected) continue; if ((track->flag&TRACK_HAS_BUNDLE)==0) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 2782aa8aca5..6f8e7656a83 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -280,6 +280,7 @@ set(SRC rna_internal.h rna_internal_types.h rna_nodetree_types.h + rna_mesh_utils.h ) blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}") |