Merge branch 'master' into develop

Author: bsavery

.github/ISSUE_TEMPLATE.MD

@@ -0,0 +1,26 @@
+Every issue should include 3 things:
+1.  System setup (GPU, CPU, OS version, Blender version)
+2.  **Most ideally** a .blend scene to reproduce this simply.  **SCREENSHOTS OR RENDERS ARE NOT A SCENE FILE**
+3.  What the expected behavior or effect is.  If possible include the error message.  
+
+You can get more information on the error message by opening Window -> Show System Console from blender and copying that text here.  On MacOS launch Blender from the Terminal.
+
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Issue
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- Provide a scene file to reproduce this bug. -->
+<!--- Or steps to reproduce if it happens with live rendering -->
+
+## System Setup (Environment)
+<!--- OS version -->
+<!--- GPU, CPU and driver version -->
+<!--- Blender version -->
+<!--- If using CPU or GPU rendering -->
+
+## Detailed Description
+<!--- Provide a detailed description of the change or addition you are proposing -->
+

src/rprblender/properties/render.py

@@ -243,6 +243,14 @@ class RPR_UserSettings(bpy.types.PropertyGroup):
         min=5, max=100, default=25,
     )
 
+    viewport_denoiser_upscale: BoolProperty(
+        name="Viewport Denoising and Upscaling",
+        description="Denoise rendered image with Machine Learning denoiser.\n"
+                    "Rendering at 2 times lower resoluting then upscaling rendered image "
+                    "in the end of render",
+        default=True if not utils.IS_MAC else False, # TODO remove when macos upscaler fixed
+    )
+
 
 class RPR_RenderProperties(RPR_Properties):
     """ Main render properties. Available from scene.rpr """