Merge branch 'V8_4_BR'

[modules/gui.git] / doc / salome / gui / input / setting_preferences.doc

diff --git a/doc/salome/gui/input/setting_preferences.doc b/doc/salome/gui/input/setting_preferences.doc
index b1c6bea108e00e004b51986af5093012fcb8af8b..9fc1772b2ee33f3390e9e6498dbde15c930987dc 100644 (file)
--- a/doc/salome/gui/input/setting_preferences.doc
+++ b/doc/salome/gui/input/setting_preferences.doc
@@ -59,6 +59,9 @@ the whole GUI SALOME session.
     the SALOME platform. 
   - <b>ASCII save</b> - if checked in, your study will be saved in
     ASCII format file (or files).
+  - <b>Automatic loading of light modules when opening study</b> -  if checked in, 
+    Light Modules of the current study will be automatically loaded at the next study
+    opening, allowing completion of object browser.
   - <b>Store positions of windows</b> -  if checked in, positions of windows
     will be saved in a special file at the end of the current session and
     then restored for a new session.
@@ -101,7 +104,7 @@ items in <b>Most Recently Used</b> list and the <b>Link type</b>:
   - \b Short - shows the file name only.
   - \b Auto - shows full paths to the files only if some files from
 different locations have the same name.
-- <b>Full-screen</b> - options concerned full-screen mode:
+- <b>Full-screen</b> 
   - <b>Hide object browser and viewers toolbars</b> - switches automatic hiding of 
   Object Browser and OCC viewer toolbar in full-screen mode.
 
@@ -140,7 +143,7 @@ different locations have the same name.
 \image html pref_salome_occviewer.png
 
 - <b>Projection mode</b> - sets the default projection mode for the viewers: Orthogonal or Perpective.
-- <b>Stereo render</b> - group of stereoscopic view settings:
+- <b>Stereo render</b> - stereoscopic view settings:
   - <b>Stereo type</b> - specifies a stereo pair type:
     - Shutter glasses (OpenGL quad-buffer)
     - Anaglyph
@@ -154,7 +157,7 @@ different locations have the same name.
     within the same SALOME GUI session. It is not possible to use 
     different stereo modes in several OCC 3D views at the same time 
     within the same SALOME GUI session.
-  - <b>Anaglyph filter</b> - specifies format of anaglyph stereo pair:
+  - <b>Anaglyph filter</b> - specifies the format of anaglyph stereo pair:
     - Red-Cyan (default)
     - Yellow-Blue
     - Green-Magenta
@@ -186,6 +189,15 @@ different locations have the same name.
   - <b>Texture</b> - allows to change the texture of the clipped region (enable if "Use default texture" is switched off).
   - <b>Modulate</b> - controls if "Texture" should be mixed with "Color" parameter or not.
   - <b>Scale factor</b> - sets the scale factor for default and custom textures.
+- <b>Ray tracing</b> - specifies the default GPU ray-tracing parameters.
+  - <b>Depth</b> - defines maximum ray-tracing depth.
+  - <b>Specular reflections</b> - enables/disables specular reflections.
+  - <b>Adaptive anti-aliasing</b> - enables/disables adaptive anti-aliasing.
+  - <b>Shadows rendering</b> - enables/disables shadows rendering.
+  - <b>Transparent shadow</b> - enables/disables light propagation through transparent media.
+- <b>Light source</b> - allows to set default parameters for directional light source.
+  - <b>Color</b> - allows to change the color of light source.
+  - <b>Dx, Dy, Dz</b> - sets direction coordinates.
 
 \anchor vtk_preferences
 <h2>VTK 3D Viewer Preferences</h2>
@@ -201,7 +213,7 @@ different locations have the same name.
   or [-] keyboard buttons.
 - <b>Modification Mode</b> - allows choosing between \b Arithmetic
   and \b Geometrical progression used for zooming.
-- <b>Stereo render</b> - group of stereoscopic view settings:
+- <b>Stereo render</b> - stereoscopic view settings:
   - <b>Stereo type</b> - specifies a stereo pair type:
     - Crystal Eyes
     - Red-Blue
@@ -217,7 +229,7 @@ different locations have the same name.
     within the same SALOME GUI session. It is not possible to use 
     different stereo modes in several VTK 3D views at the same time 
     within the same SALOME GUI session.
-  - <b>Anaglyph filter</b> - specifies format of anaglyph stereo pair:
+  - <b>Anaglyph filter</b> - specifies the format of anaglyph stereo pair:
     - Red-Cyan (default)
     - Yellow-Blue
     - Green-Magenta