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

Merge branch 'release/1.9.x'

Browse Source 
Conflicts:
	dtool/PandaVersion.pp
This commit is contained in:
rdb 2015-12-09 22:57:48 +01:00
commit 6cb93f588b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -1815,6 +1815,9 @@ reset() {
_glGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
_glGenerateMipmap = glGenerateMipmap;
#else
// Make sure this is properly initialized.
_glGenerateMipmap = NULL;
//TODO: add ARB/3.0 version
_supports_framebuffer_object = false;

9
panda/src/parametrics/nurbsCurveEvaluator.cxx
View File

@ -244,8 +244,13 @@ get_vertices(NurbsCurveEvaluator::Vert3Array &verts, const NodePath &rel_to) con
int vi;
for (vi = 0; vi < num_vertices; vi++) {
LVecBase4 vertex = get_vertex(vi, rel_to);
LPoint3 v3(vertex[0] / vertex[3], vertex[1] / vertex[3], vertex[2] / vertex[3]);
verts.push_back(v3);
// Avoid division by zero
if (vertex[3] == 0.0) {
verts.push_back(LPoint3(vertex[0], vertex[1], vertex[2]));
} else {
LPoint3 v3(vertex[0] / vertex[3], vertex[1] / vertex[3], vertex[2] / vertex[3]);
verts.push_back(v3);
}
}
}

1
panda/src/parametrics/nurbsVertex.I
View File

@ -20,6 +20,7 @@
////////////////////////////////////////////////////////////////////
INLINE NurbsVertex::
NurbsVertex() {
_vertex.set(0, 0, 0, 1);
}
////////////////////////////////////////////////////////////////////