RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor formatting changes

This commit is contained in:
David Rose 2003-09-23 17:43:18 +00:00
parent 5b8382f6cc
commit 03297f74c8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/builder/builder.cxx
View File

@ -108,10 +108,10 @@ public:
// _node pointer was any other kind of node, a GeomNode
// will be created and parented to that node, and its
// name will be the name of the bucket. In this case,
// the name of the bucket can also be used to different
// nodes: if two buckets reference the same node, but
// have different names, then two different GeomNodes
// are created, one with each name.
// the name of the bucket can also be used to
// differentiate nodes: if two buckets reference the
// same node, but have different names, then two
// different GeomNodes are created, one with each name.
////////////////////////////////////////////////////////////////////
GeomNode *Builder::
build(const string &default_name) {
@ -130,7 +130,8 @@ build(const string &default_name) {
// const string &name = bucket->get_name();
GeomNode *geom_node = NULL;
if (node!=NULL && node->is_of_type(GeomNode::get_class_type())) {
if (node != (PandaNode *)NULL &&
node->is_of_type(GeomNode::get_class_type())) {
// The node is a GeomNode. In this case, we simply use that
// node. We can't separate them out by name in this case; we'll
// just assign to it the first nonempty name we encounter.

1
panda/src/builder/builderBucket.cxx
View File

@ -60,7 +60,6 @@ BuilderBucket &BuilderBucket::
operator = (const BuilderBucket &copy) {
((BuilderProperties &)*this) = (BuilderProperties &)copy;
// setGState(copy._state);
set_name(copy.get_name());
set_coords(copy._coords);
set_normals(copy._normals);