summaryrefslogtreecommitdiff
path: root/editor/import/collada.h
diff options
context:
space:
mode:
Diffstat (limited to 'editor/import/collada.h')
-rw-r--r--editor/import/collada.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/import/collada.h b/editor/import/collada.h
index 4707d7d779..b74332fb22 100644
--- a/editor/import/collada.h
+++ b/editor/import/collada.h
@@ -404,7 +404,7 @@ public:
Node() {
noname = false;
type = TYPE_NODE;
- parent = NULL;
+ parent = nullptr;
ignore_anim = false;
}
virtual ~Node() {
@@ -424,7 +424,7 @@ public:
String sid;
NodeJoint() {
type = TYPE_JOINT;
- owner = NULL;
+ owner = nullptr;
}
};
@@ -631,7 +631,7 @@ private: // private stuff
String _read_empty_draw_type(XMLParser &parser);
void _joint_set_owner(Collada::Node *p_node, NodeSkeleton *p_owner);
- void _create_skeletons(Collada::Node **p_node, NodeSkeleton *p_skeleton = NULL);
+ void _create_skeletons(Collada::Node **p_node, NodeSkeleton *p_skeleton = nullptr);
void _find_morph_nodes(VisualScene *p_vscene, Node *p_node);
bool _remove_node(Node *p_parent, Node *p_node);
void _remove_node(VisualScene *p_vscene, Node *p_node);