From 54db46582aba2252d544fa3956522f9ef06b49cb Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 15 Oct 2012 16:50:35 +0200
Subject: xserver mesa pixman git update 15 oct 2012

xserver: a69429a17bf4630f6e26f61630a1c2b287202627
pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1
mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
---
 mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c')

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
index b47a2d87f..ac38128df 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -298,6 +298,9 @@ st_bufferobj_map_range(struct gl_context *ctx,
       obj->Length = length;
       obj->AccessFlags = access;
    }
+   else {
+      st_obj->transfer = NULL;
+   }
 
    return obj->Pointer;
 }
-- 
cgit v1.2.3