From ff642fe771fa7285fbd8a5e44250db5a4e489878 Mon Sep 17 00:00:00 2001 From: "Asad M. Zaman" Date: Fri, 18 Feb 2005 23:18:51 +0000 Subject: [PATCH] it seems maya can give polygons without any shadermake install! so this takes care of the null shader pointer situation --- pandatool/src/mayaegg/mayaToEggConverter.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandatool/src/mayaegg/mayaToEggConverter.cxx b/pandatool/src/mayaegg/mayaToEggConverter.cxx index 3da9506c6c..37286c184a 100644 --- a/pandatool/src/mayaegg/mayaToEggConverter.cxx +++ b/pandatool/src/mayaegg/mayaToEggConverter.cxx @@ -1671,6 +1671,7 @@ make_polyset(MayaNodeDesc *node_desc, const MDagPath &dag_path, int index = pi.index(); nassertv(index >= 0 && index < (int)poly_shader_indices.length()); int shader_index = poly_shader_indices[index]; + if (shader_index != -1) { nassertv(shader_index >= 0 && shader_index < (int)shaders.length()); MObject engine = shaders[shader_index]; @@ -1681,13 +1682,14 @@ make_polyset(MayaNodeDesc *node_desc, const MDagPath &dag_path, shader = default_shader; } + const MayaShaderColorDef *color_def = NULL; + // And apply the shader properties to the polygon. if (shader != (MayaShader *)NULL) { set_shader_attributes(*egg_poly, *shader, &pi); + color_def = shader->get_color_def(); } - const MayaShaderColorDef *color_def = shader->get_color_def(); - // Should we extract the color from the vertices? Normally, in // Maya a texture completely replaces the vertex color, so we // should ignore the vertex color if we have a texture.