[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44235] trunk/blender/source/blender: Change texface draw to always use glShadeModel(GL_SMOOTH), with texface draw.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 19 04:10:30 CET 2012
Revision: 44235
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44235
Author: campbellbarton
Date: 2012-02-19 03:10:11 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenlib/BLI_array.h
trunk/blender/source/blender/blenlib/BLI_threads.h
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-19 02:54:50 UTC (rev 44234)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-19 03:10:11 UTC (rev 44235)
@@ -488,9 +488,6 @@
cp= (unsigned char*)mcol;
}
}
- else {
- glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
- }
glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
if (!drawSmooth) {
@@ -564,9 +561,6 @@
cp= (unsigned char*)mcol;
}
}
- else {
- glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT);
- }
glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
if (!drawSmooth) {
@@ -617,6 +611,8 @@
}
}
}
+
+ glShadeModel(GL_FLAT);
}
static void emDM_drawFacesTex(
Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h 2012-02-19 02:54:50 UTC (rev 44234)
+++ trunk/blender/source/blender/blenlib/BLI_array.h 2012-02-19 03:10:11 UTC (rev 44235)
@@ -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) \
Modified: trunk/blender/source/blender/blenlib/BLI_threads.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_threads.h 2012-02-19 02:54:50 UTC (rev 44234)
+++ trunk/blender/source/blender/blenlib/BLI_threads.h 2012-02-19 03:10:11 UTC (rev 44235)
@@ -76,6 +76,7 @@
#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);
More information about the Bf-blender-cvs
mailing list