diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:10:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 07:10:11 +0400 |
commit | 445003973434da55614e90fcee2f99f1765afd8f (patch) | |
tree | 0186dfc93e285db1bde059f93e78f48b37835b3d /source | |
parent | f75bf20c817d9e09b23513d007bc8cc69ff00d48 (diff) |
Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.
without this each face would get a solid color, this is the same method used in object mode.
also copy BLI_array.h fix from bmesh branch.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 8 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_array.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_threads.h | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index bb1d20f0187..62f11eb2631 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -488,9 +488,6 @@ static void emDM_drawFacesTex_common( cp= (unsigned char*)mcol; } } - else { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } glBegin(efa->v4?GL_QUADS:GL_TRIANGLES); if (!drawSmooth) { @@ -564,9 +561,6 @@ static void emDM_drawFacesTex_common( cp= (unsigned char*)mcol; } } - else { - glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); - } glBegin(efa->v4?GL_QUADS:GL_TRIANGLES); if (!drawSmooth) { @@ -617,6 +611,8 @@ static void emDM_drawFacesTex_common( } } } + + glShadeModel(GL_FLAT); } static void emDM_drawFacesTex( diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h index a5453f1537b..9fa66e91393 100644 --- a/source/blender/blenlib/BLI_array.h +++ b/source/blender/blenlib/BLI_array.h @@ -177,11 +177,11 @@ * same purpose as BLI_array_staticdeclare() * but use when the max size is known ahead of time */ #define BLI_array_fixedstack_declare(arr, maxstatic, realsize, allocstr) \ - char _##arr##_static[maxstatic*sizeof(*arr)]; \ + char _##arr##_static[maxstatic*sizeof(*(arr))]; \ const int _##arr##_is_static= ((void *)_##arr##_static) != ( \ - arr= (realsize <= maxstatic) ? \ + arr= ((realsize) <= maxstatic) ? \ (void *)_##arr##_static : \ - MEM_mallocN(sizeof(*arr)*realsize, allocstr) \ + MEM_mallocN(sizeof(*(arr)) * (realsize), allocstr) \ ) \ #define BLI_array_fixedstack_free(arr) \ diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 8e75a2db629..03bf375a894 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -76,6 +76,7 @@ int BLI_system_thread_count(void); /* gets the number of threads the system can #define LOCK_OPENGL 5 #define LOCK_NODES 6 #define LOCK_MOVIECLIP 7 +#define LOCK_SCANFILL 8 void BLI_lock_thread(int type); void BLI_unlock_thread(int type); |