diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-09 16:30:12 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-09 16:30:12 +0300 |
| commit | 606de8221817d138d0aa3be2a373b954d13357fe (patch) | |
| tree | a34acdfa8c77b2e419c824900ece870479307964 /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 5186062d582dee0ce4ef6c461e45d1654aff3e16 (diff) | |
| parent | 59dd3735bf63bb95240d70344e159d7584e6c1d4 (diff) | |
Merge branch 'wiggly-widgets' into gooseberry
Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/makesdna/DNA_customdata_types.h
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 0729778afef..fc97d156852 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1801,7 +1801,6 @@ static void ccgDM_prepare_normal_data(DerivedMesh *dm, float *varray, int *vinde if (ln) { /* Can't use quad strips here... */ - glBegin(GL_QUADS); for (y = 0; y < gridFaces; y ++) { for (x = 0; x < gridFaces; x ++) { start = vindex[mat_orig_to_new[matnr]]; @@ -1819,7 +1818,6 @@ static void ccgDM_prepare_normal_data(DerivedMesh *dm, float *varray, int *vinde ln ++; } } - glEnd(); } else if (shademodel == GL_SMOOTH) { for (y = 0; y < gridFaces; y ++) { @@ -1835,8 +1833,8 @@ static void ccgDM_prepare_normal_data(DerivedMesh *dm, float *varray, int *vinde copy_v3_v3(&varray[start + 3], c); copy_v3_v3(&varray[start + 6], b); - copy_v3_v3(&varray[start + 9], b); - copy_v3_v3(&varray[start + 12], d); + copy_v3_v3(&varray[start + 9], d); + copy_v3_v3(&varray[start + 12], b); copy_v3_v3(&varray[start + 15], a); vindex[mat_orig_to_new[matnr]] += 18; @@ -1915,8 +1913,8 @@ static void ccgDM_prepare_vertex_data(DerivedMesh *dm, float *varray, int *vinde copy_v3_v3(&varray[start + 3], c); copy_v3_v3(&varray[start + 6], b); - copy_v3_v3(&varray[start + 9], b); - copy_v3_v3(&varray[start + 12], d); + copy_v3_v3(&varray[start + 9], d); + copy_v3_v3(&varray[start + 12], b); copy_v3_v3(&varray[start + 15], a); vindex[mat_orig_to_new[matnr]] += 18; |