Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into V9_3_BR
[modules/geom.git]
/
src
/
OBJECT
/
GEOM_Constants.h
diff --git
a/src/OBJECT/GEOM_Constants.h
b/src/OBJECT/GEOM_Constants.h
index 873f6b2a536f57c8cef1a03bf11d99b557ce3fa7..e207686a0ae7bdd3cecd60d16fd6b2ca6a4c0914 100644
(file)
--- a/
src/OBJECT/GEOM_Constants.h
+++ b/
src/OBJECT/GEOM_Constants.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-58,7
+58,8
@@
namespace GEOM
OutlineColor,
Texture,
Dimensions,
OutlineColor,
Texture,
Dimensions,
- LastProperty = Dimensions,
+ ShapeAnnotations,
+ LastProperty = ShapeAnnotations,
};
GEOM_OBJECT_EXPORT double minDeflection();
};
GEOM_OBJECT_EXPORT double minDeflection();