[Bf-blender-cvs] [65906b305a6] usd-importer-T81257-merge: USD importer compile error fix.

[makowalski]

Commit: 65906b305a65a46e21444d25197ad4aa79967b41
Author: makowalski
Date:   Fri Jun 18 17:51:53 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB65906b305a65a46e21444d25197ad4aa79967b41

USD importer compile error fix.

===================================================================

M	source/blender/io/usd/intern/usd_reader_stage.cc

===================================================================

diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 6d98f7d5fdc..4a3bdfc3e7d 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -247,7 +247,7 @@ USDPrimReader *USDStageReader::collect_readers(Main *bmain, const pxr::UsdPrim &
 
     USDPrimReader *child_reader = child_readers.front();
 
-    if (_merge_with_parent(child_reader)) {
+    if (merge_with_parent(child_reader)) {
       return child_reader;
     }
   }