mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
Merge compiler fix
This commit is contained in:
commit
493b66c97d
@ -1544,7 +1544,7 @@ issue_parameters(int altered) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
GLint p = spec._id._seqno;
|
GLint p = spec._id._seqno;
|
||||||
int array_size = min(spec._dim[0], ptr_data->_size / spec._dim[1]);
|
int array_size = min(spec._dim[0], (int)ptr_data->_size / spec._dim[1]);
|
||||||
switch (spec._type) {
|
switch (spec._type) {
|
||||||
case Shader::SPT_float:
|
case Shader::SPT_float:
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user