From 445003973434da55614e90fcee2f99f1765afd8f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 19 Feb 2012 03:10:11 +0000 Subject: 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. --- source/blender/blenlib/BLI_array.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenlib/BLI_array.h') 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) \ -- cgit v1.2.3