[Bf-blender-cvs] [0a08c5cd36d] blender2.8: Fix : Build error with uchar in intern_gawain.
Ray Molenkamp
noreply at git.blender.org
Sun Jun 17 05:49:47 CEST 2018
Commit: 0a08c5cd36d32e72110e9452e0278527ef42bc70
Author: Ray Molenkamp
Date: Sat Jun 16 21:49:11 2018 -0600
Branches: blender2.8
https://developer.blender.org/rB0a08c5cd36d32e72110e9452e0278527ef42bc70
Fix : Build error with uchar in intern_gawain.
error introduced by D3483, intern_gawain has no access to bli_systypes.h
===================================================================
M intern/gawain/gawain/gwn_vertex_buffer.h
===================================================================
diff --git a/intern/gawain/gawain/gwn_vertex_buffer.h b/intern/gawain/gawain/gwn_vertex_buffer.h
index 87606ed47c8..b92e4a87698 100644
--- a/intern/gawain/gawain/gwn_vertex_buffer.h
+++ b/intern/gawain/gawain/gwn_vertex_buffer.h
@@ -34,7 +34,7 @@ typedef struct Gwn_VertBuf {
unsigned vertex_ct; // number of verts we want to draw
unsigned vertex_alloc; // number of verts data
bool dirty;
- uchar* data; // NULL indicates data in VRAM (unmapped)
+ unsigned char* data; // NULL indicates data in VRAM (unmapped)
uint32_t vbo_id; // 0 indicates not yet allocated
Gwn_UsageType usage; // usage hint for GL optimisation
} Gwn_VertBuf;
@@ -71,17 +71,17 @@ void GWN_vertbuf_attr_fill_stride(Gwn_VertBuf*, unsigned a_idx, unsigned stride,
typedef struct Gwn_VertBufRaw {
unsigned size;
unsigned stride;
- uchar* data;
- uchar* data_init;
+ unsigned char* data;
+ unsigned char* data_init;
#if TRUST_NO_ONE
// Only for overflow check
- uchar* _data_end;
+ unsigned char* _data_end;
#endif
} Gwn_VertBufRaw;
GWN_INLINE void *GWN_vertbuf_raw_step(Gwn_VertBufRaw *a)
{
- uchar* data = a->data;
+ unsigned char* data = a->data;
a->data += a->stride;
#if TRUST_NO_ONE
assert(data < a->_data_end);
More information about the Bf-blender-cvs
mailing list