diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-07-08 10:23:37 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-07-08 10:23:37 +0300 |
| commit | 9ba5568539607a2b7edb73c13b8e2271e63382dd (patch) | |
| tree | c1d57bdf194f282ba70c4d3ad83eb3747a145b1f /src/slic3r/GUI/3DBed.cpp | |
| parent | d15698e21e86a4e896bbb5f3c59440ec2dc721e9 (diff) | |
| parent | f617d747293de0e0bbb500ced8c4a66cdbdadf24 (diff) | |
Fixed conflicts after merge with master
Diffstat (limited to 'src/slic3r/GUI/3DBed.cpp')
| -rw-r--r-- | src/slic3r/GUI/3DBed.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 2b2631ab8..482cd58ad 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -627,12 +627,12 @@ void Bed3D::render_prusa_shader(bool transparent) const if (position_id != -1) { glsafe(::glEnableVertexAttribArray(position_id)); - glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, stride, (GLvoid*)m_triangles.get_position_offset())); + glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, stride, (GLvoid*)(intptr_t)m_triangles.get_position_offset())); } if (tex_coords_id != -1) { glsafe(::glEnableVertexAttribArray(tex_coords_id)); - glsafe(::glVertexAttribPointer(tex_coords_id, 2, GL_FLOAT, GL_FALSE, stride, (GLvoid*)m_triangles.get_tex_coords_offset())); + glsafe(::glVertexAttribPointer(tex_coords_id, 2, GL_FLOAT, GL_FALSE, stride, (GLvoid*)(intptr_t)m_triangles.get_tex_coords_offset())); } glsafe(::glDrawArrays(GL_TRIANGLES, 0, (GLsizei)m_triangles.get_vertices_count())); |