TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

glsl: fix issue with vertex colors not showing up

Browse Source
This commit is contained in:
rdb 2017-03-10 12:25:21 +01:00
parent 4f299fa71f
commit ce736ad093
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -2194,7 +2194,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
// Figure out which attributes to enable or disable. // Figure out which attributes to enable or disable.
BitMask32 enabled_attribs = _enabled_attribs; BitMask32 enabled_attribs = _enabled_attribs;
if (_color_attrib_index != -1 && if (_color_attrib_index != -1 &&
color_attrib->get_type() != ColorAttrib::T_vertex) { color_attrib->get_color_type() != ColorAttrib::T_vertex) {
// Vertex colours are disabled. // Vertex colours are disabled.
enabled_attribs.clear_bit(_color_attrib_index); enabled_attribs.clear_bit(_color_attrib_index);
@ -2247,7 +2247,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) {
// Don't apply vertex colors if they are disabled with a ColorAttrib. // Don't apply vertex colors if they are disabled with a ColorAttrib.
int num_elements, element_stride, divisor; int num_elements, element_stride, divisor;
bool normalized; bool normalized;
if ((p != _color_attrib_index || color_attrib->get_type() == ColorAttrib::T_vertex) && if ((p != _color_attrib_index || color_attrib->get_color_type() == ColorAttrib::T_vertex) &&
_glgsg->_data_reader->get_array_info(name, array_reader, _glgsg->_data_reader->get_array_info(name, array_reader,
num_values, numeric_type, num_values, numeric_type,
normalized, start, stride, divisor, normalized, start, stride, divisor,