Modified to assign CSF_PluginDefaults only for GEOM

diff --git a/bin/setenv.py b/bin/setenv.py
index 955e43ae3a74ad560ff44891e352d5c8900e0f7c..5ee55b7d929a7f1d163df9a0c584b88105e5c718 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -264,18 +264,16 @@ def set_env(args, modules_list, modules_root_dir):
     #if os.getenv("GUI_ROOT_DIR"):
         #if not os.getenv("SalomeAppConfig"): os.environ["SalomeAppConfig"] =  os.getenv("GUI_ROOT_DIR") + "/share/salome/resources/gui"
 
-    # set CSF_PluginDefaults variable only if it is not customized
-    # by the user
-    if not os.getenv("CSF_PluginDefaults"):
-        os.environ["CSF_PluginDefaults"] \
-        = os.path.join(modules_root_dir["KERNEL"],"share",
-                       salome_subdir,"resources","kernel")
     os.environ["CSF_SALOMEDS_ResourcesDefaults"] \
     = os.path.join(modules_root_dir["KERNEL"],"share",
                    salome_subdir,"resources","kernel")
 
     if "GEOM" in modules_list:
         if verbose(): print "GEOM OCAF Resources" 
+        
+       # set CSF_PluginDefaults variable only if it is not customized
+        # by the user
+
         if not os.getenv("CSF_PluginDefaults"):
            os.environ["CSF_PluginDefaults"] \
            = os.path.join(modules_root_dir["GEOM"],"share",