Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

src/Mod/Raytracing/App/CMakeLists.txt

@@ -59,6 +59,7 @@ SET(Raytracing_Scripts
 
 SET(Raytracing_Templates
     Templates/ProjectStd.pov
+    Templates/RadiosityNormal.pov
 )
 
 add_library(Raytracing SHARED ${Raytracing_SRCS})

src/Mod/Raytracing/Gui/Command.cpp

@@ -518,7 +518,7 @@ void CmdRaytracingRender::activated(int iMsg)
         int height = hGrp->GetInt("OutputHeight", 600);
         std::stringstream h;
         h << height;
-        std::string par = hGrp->GetASCII("OutputParameters", "+UA +P +A");
+        std::string par = hGrp->GetASCII("OutputParameters", "+P +A");
         std::string fname = (const char*)fn.toUtf8();
         openCommand("Render project");
         doCommand(Doc,"PageFile = open(App.activeDocument().%s.PageResult,'r')",Sel[0].FeatName);

src/Mod/Raytracing/Gui/DlgSettingsRay.ui

@@ -146,7 +146,7 @@
              <string>The povray parameters to be passed to the render.</string>
             </property>
             <property name="text">
-             <string>+UA +P +A</string>
+             <string>+P +A</string>
             </property>
             <property name="prefEntry" stdset="0">
              <cstring>OutputParameters</cstring>

src/Mod/Raytracing/Templates/RadiosityNormal.pov

@@ -0,0 +1,41 @@
+    // Persistence of Vision Ray Tracer Scene Description File
+    // for FreeCAD (http://www.freecadweb.org)
+
+    #version 3.6;
+
+    #include "colors.inc"
+    #include "metals.inc"
+    #include "rad_def.inc"
+
+    global_settings {
+        radiosity {
+            Rad_Settings(Radiosity_Normal,off,off)
+        }
+    }
+
+    #default {finish{ambient 0}}
+
+    sky_sphere {
+        pigment {
+            gradient y
+            color_map {
+                [0.0  color LightGray]
+                [0.3  color White]
+                [0.7  color LightGray]
+            }
+        }
+    }
+
+    // Standard finish
+    #declare StdFinish = finish { crand 0.01 diffuse 0.8 };
+
+    //RaytracingContent
+
+    //default light
+    light_source {
+        cam_location
+        color White
+        area_light <100, 0, 0>, <0, 0, 100>, 10, 10
+        adaptive 1
+        jitter
+    }