Revision: 17030
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17030
Author: blendix
Date: 2008-10-12 00:16:39 +0200 (Sun, 12 Oct 2008)
Log Message:
-----------
Actual fix for bug #17819, that doesn't disable the functionality, crash with
tiled image textures in the game engine.
Modified Paths:
--------------
trunk/blender/source/blender/gpu/intern/gpu_draw.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2008-10-11 20:54:18 UTC
(rev 17029)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2008-10-11 22:16:39 UTC
(rev 17030)
@@ -359,6 +359,8 @@
else
GTS.tile= tftile;
+ GTS.tile = MAX2(0, GTS.tile);
+
if(ima) {
GTS.tileXRep = ima->xrep;
GTS.tileYRep = ima->yrep;
@@ -448,9 +450,6 @@
/* for tiles, copy only part of image into buffer */
if (GTS.tilemode) {
- return 0; //disabled for now, it causes crashes
- //see
http://projects.blender.org/tracker/index.php?func=detail&aid=17819&group_id=9&atid=125
-
tilerect= MEM_mallocN(rectw*recth*sizeof(*tilerect),
"tilerect");
for (y=0; y<recth; y++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
