Merge branch 'cadbld'

# Conflicts:
#	src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
#	src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Translation.cpp

diff --cc src/Config/Config_ModuleReader.cpp
Simple merge

diff --cc src/ExchangePlugin/ExchangePlugin_Import.cpp
Simple merge

diff --cc src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
index a3f08292a9234dc0fcb43208d934e485ad129f41,adb0c81f0b97ba739e3d53aa5f203c63043139c7..4e3d05ba23f41abe7458901cd29e9c10c768062e
--- 1/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
@@@ -224,10 -224,9 +224,10 @@@ void FeaturesPlugin_MultiRotation::perf
    anObjects.topLevelObjects(aTopLevel);
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Rotated");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Rotated");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
index 5fafcb11a144315bba93ec574b948a943422252c,637fcfa31904ed3ff378e1c2f113f4ac2c5f4e6e..8ee89a08f6003f9e18344ecb939cb1a6b5e3624a
--- 1/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
@@@ -170,10 -170,9 +170,10 @@@ void FeaturesPlugin_MultiTranslation::e
    anObjects.topLevelObjects(aTopLevel);
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Translated");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Translated");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
index 8b109aed114fa416b21a60de1fc908363bb61f6a,7a21c667a38a5e1ddc6792734ef6db1a7df68b4c..a357658f5cae9cfa316f4aa7e2215ba10ca56952
--- 1/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
@@@ -179,10 -179,9 +179,10 @@@ void FeaturesPlugin_Placement::execute(
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      //LoadNamingDS
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Placed");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Placed");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
index 8627c4c64aed5d9b961ed1a9dcfddd6ea0710c5a,144e57ef23e9a5b8fc389f6a3ff9d6855f78c44a..473d5964a3cedece2e8b960c44fbc0155dfe64f9
--- 1/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
@@@ -225,10 -225,9 +225,10 @@@ void FeaturesPlugin_Rotation::performRo
    anObjects.topLevelObjects(aTopLevel);
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Rotated");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Rotated");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
index 6766e10dc39f59c1bcafae58e8529363cce4c249,6c92629c8d09df873234d844fc71f4a791291c66..f53834fc5ba0507ef52f0a57055083b487ecc614
--- 1/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
@@@ -142,10 -142,9 +142,10 @@@ void FeaturesPlugin_Scale::performScale
    anObjects.topLevelObjects(aTopLevel);
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Scaled");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Scaled");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  
@@@ -215,10 -214,9 +215,10 @@@ void FeaturesPlugin_Scale::performScale
    anObjects.topLevelObjects(aTopLevel);
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Scaled");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Scaled");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
index 9a5830bcfdb1dad80651494f3ee2a049d7ec61dc,d007306fcff36dd4b16670945f5039ba6c788168..5ad5d61a2d7e4460ce430a5fc7135f4254bc5a07
--- 1/src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
@@@ -209,10 -209,9 +209,10 @@@ void FeaturesPlugin_Symmetry::buildResu
  {
    // Store and name the result.
    ResultBodyPtr aResultBody = document()->createBody(data(), theResultIndex);
-   FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, theOriginalShapes, ListOfShape(),
-                                            theAlgo, theTargetShape, "Symmetried");
+   ModelAPI_Tools::loadModifiedShapes(aResultBody, theOriginalShapes, ListOfShape(),
+                                      theAlgo, theTargetShape, "Symmetried");
 -  aResultBody->setTextureFile(theTextureFile);
 +  // Copy image data, if any
 +  ModelAPI_Tools::copyImageAttribute(theTextureSource, aResultBody);
    setResult(aResultBody, theResultIndex++);
  }
  

diff --cc src/FeaturesPlugin/FeaturesPlugin_Tools.cpp
Simple merge

diff --cc src/FeaturesPlugin/FeaturesPlugin_Tools.h
Simple merge

diff --cc src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
index 9586fea926fe33a8cd88196856d5def7581ccf41,ca8039765473a21a2035af356ffbd2a69bbfa3cf..93aa595ede7ce85efe36bed1a960925cc58119eb
--- 1/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
--- 2/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
@@@ -240,10 -240,9 +240,10 @@@ void FeaturesPlugin_Translation::perfor
    for (ListOfShape::iterator anIt = aTopLevel.begin(); anIt != aTopLevel.end(); ++anIt) {
      //LoadNamingDS
      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-     FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
-                                              aMakeShapeList, *anIt, "Translated");
+     ModelAPI_Tools::loadModifiedShapes(aResultBody, anOriginalShapes, ListOfShape(),
+                                        aMakeShapeList, *anIt, "Translated");
 -    aResultBody->setTextureFile(theTextureFile);
 +    // Copy image data, if any
 +    ModelAPI_Tools::copyImageAttribute(aTextureSource, aResultBody);
      setResult(aResultBody, aResultIndex++);
    }
  

diff --cc src/ModelAPI/ModelAPI_Events.cpp
Simple merge

diff --cc src/ModelAPI/ModelAPI_Events.h
Simple merge

diff --cc src/ModelAPI/ModelAPI_Tools.cpp
index 9554d1e1068b0ac9021f8c493b059c8408c2b79b,5db4588bbc9c4f8bed20a6cb8b81cf701567d112..282a40de4e74c423ab8ba172ca5c74005c9c1706
--- 1/src/ModelAPI/ModelAPI_Tools.cpp
--- 2/src/ModelAPI/ModelAPI_Tools.cpp
+++ b/src/ModelAPI/ModelAPI_Tools.cpp
@@@ -40,9 -39,9 +40,10 @@@
  #include <Events_Loop.h>
  #include <Locale_Convert.h>
  
+ #include <GeomAlgoAPI_MakeShape.h>
  #include <GeomAPI_ShapeHierarchy.h>
  #include <GeomAPI_ShapeIterator.h>
 +#include <GeomAPI_ShapeExplorer.h>
  
  #include <algorithm>
  #include <iostream>

diff --cc src/ModelAPI/ModelAPI_Tools.h
Simple merge

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge