Merge pull request #2075 from AnimalLogic/csyshing/remove_tracking_se…

…lectability_lock_prim [al] Removed tracking selectability and lock metadata
Autodesk · Feb 10, 2022 · f41faf9 · f41faf9
2 parents 885f7ab + cb7dfa7
commit f41faf9
Show file tree

Hide file tree

Showing 15 changed files with 169 additions and 992 deletions.
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/PluginRegister.h
@@ -211,10 +211,6 @@ template <typename AFnPlugin> MStatus registerPlugin(AFnPlugin& plugin)
         MGlobal::setOptionVarValue("AL_usdmaya_pushToPrim", true);
     }
 
-    if (!MGlobal::optionVarExists("AL_usdmaya_ignoreLockPrims")) {
-        MGlobal::setOptionVarValue("AL_usdmaya_ignoreLockPrims", false);
-    }
-
     MStatus status;
 
     // gpuCachePluginMain used as an example.
@@ -345,11 +341,6 @@ template <typename AFnPlugin> MStatus registerPlugin(AFnPlugin& plugin)
         "optionVar -iv \\\"AL_usdmaya_pushToPrim\\\" #1",
         true,
         MGlobal::optionVarIntValue("AL_usdmaya_pushToPrim"));
-    AL::maya::utils::MenuBuilder::addEntry(
-        "USD/Selection Ignore Lock Prims Enabled",
-        "optionVar -iv \\\"AL_usdmaya_ignoreLockPrims\\\" #1",
-        true,
-        MGlobal::optionVarIntValue("AL_usdmaya_ignoreLockPrims"));
     CHECK_MSTATUS(AL::maya::utils::MenuBuilder::generatePluginUI(plugin, "AL_usdmaya"));
     AL::usdmaya::Global::onPluginLoad();
 

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.cpp
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/SelectabilityDB.h
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/cmds/ProxyShapeCommands.cpp
@@ -1037,11 +1037,8 @@ MStatus TranslatePrim::redoIt()
     TF_DEBUG(ALUSDMAYA_COMMANDS).Msg("TranslatePrim::redoIt\n");
     m_proxy->translatePrimPathsIntoMaya(newImportPaths, m_teardownPaths, tp);
 
-    // construct locks and selectability for imported prims
-    if (m_proxy->isLockPrimFeatureActive()) {
-        m_proxy->removeMetaData(m_teardownPaths);
-        m_proxy->processChangedMetaData(SdfPathVector(), newImportPaths);
-    }
+    // construct locks for imported prims
+    m_proxy->constructLockPrims();
 
     if (!m_updatePaths.empty()) {