[Bf-blender-cvs] [4af44ffd877] usd-importer-T81257-merge: USD Import: Minor instancing fixes.

[makowalski]

Commit: 4af44ffd87733f7855d590fbe9059aa007fbb8e2
Author: makowalski
Date:   Wed Mar 3 10:10:32 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB4af44ffd87733f7855d590fbe9059aa007fbb8e2

USD Import: Minor instancing fixes.

Small edit to the Instancing import option parameter
description.  Now allowing setting null instance collection
on USDInstanceReader objects.

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

M	source/blender/editors/io/io_usd.c
M	source/blender/io/usd/intern/usd_reader_instance.cc

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

diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c
index 671e05e54b5..145d6f2a57c 100644
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@ -591,8 +591,8 @@ void WM_OT_usd_import(struct wmOperatorType *ot)
       "use_instancing",
       false,
       "Instancing",
-      "When checked, USD scenegraph instances are imported as collection instances in Blender. "
-      "(Note that point instancers are not yet handled by this option.)");
+      "When checked, USD scenegraph instances are imported as collection instances in Blender.  "
+      "Note that point instancers are not yet handled by this option");
 }
 
 #endif /* WITH_USD */
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index 5ed32956898..60c09a61dc9 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -48,7 +48,7 @@ void USDInstanceReader::createObject(Main *bmain, double motionSampleTime)
 
 void USDInstanceReader::set_instance_collection(Collection *coll)
 {
-  if (coll && this->m_object) {
+  if (this->m_object) {
     this->m_object->instance_collection = coll;
   }
 }