tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-18 04:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace NULL with nullptr

Browse Source
This commit is contained in:
lupoDharkael
2020-04-02 13:38:00 +02:00
parent 5f11e15571
commit 95a1400a2a
755 changed files with 5742 additions and 5742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/import/collada.cpp
+6 -6
View File
@@ -1540,7 +1540,7 @@ Collada::Node *Collada::_parse_visual_node_instance_data(XMLParser &parser) {
}
if (parser.is_empty()) //nothing else to parse...
return NULL;
return nullptr;
while (parser.read() == OK) {
@@ -1548,7 +1548,7 @@ Collada::Node *Collada::_parse_visual_node_instance_data(XMLParser &parser) {
break;
}
return NULL;
return nullptr;
}
Collada::Node *Collada::_parse_visual_scene_node(XMLParser &parser) {
@@ -1572,7 +1572,7 @@ Collada::Node *Collada::_parse_visual_scene_node(XMLParser &parser) {
String empty_draw_type = "";
Node *node = NULL;
Node *node = nullptr;
name = parser.has_attribute("name") ? parser.get_attribute_value_safe("name") : parser.get_attribute_value_safe("id");
if (name == "") {
@@ -2140,7 +2140,7 @@ void Collada::_create_skeletons(Collada::Node **p_node, NodeSkeleton *p_skeleton
NodeJoint *nj = static_cast<NodeJoint *>(node);
nj->owner = p_skeleton;
} else {
p_skeleton = NULL;
p_skeleton = nullptr;
}
for (int i = 0; i < node->children.size(); i++) {
@@ -2240,7 +2240,7 @@ void Collada::_merge_skeletons2(VisualScene *p_vscene) {
SkinControllerData &cd = E->get();
NodeSkeleton *skeleton = NULL;
NodeSkeleton *skeleton = nullptr;
for (Map<String, Transform>::Element *F = cd.bone_rest_map.front(); F; F = F->next()) {
@@ -2257,7 +2257,7 @@ void Collada::_merge_skeletons2(VisualScene *p_vscene) {
Node *node = state.scene_map[name];
ERR_CONTINUE(node->type != Node::TYPE_JOINT);
NodeSkeleton *sk = NULL;
NodeSkeleton *sk = nullptr;
while (node && !sk) {