Merge branch 'v4.4/master' into v4.4/fix-preview-shape-material

Author: Karl Henkel

CHANGELOG.md

@@ -5,9 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [4.4.2] - 2021-01-08
 
 - Fixed the insertion of new points on a Poly Shape being unreliable.
+- Fixed rect selection not working with Universal Render Pipeline.
 - [case: 1281254] Fixed shader warning in URP for UNITY_PASS_FORWARDBASE macro redefinition.
 - [case: 1294866] Fix annotation warning on InitializeOnLoad call.
 - [case: 1304561] Fix `Shape Preview` not rendering with the blue preview tint.

Runtime/Core/SelectionPickerRendererStandard.cs

@@ -1,4 +1,6 @@
-using UObject = UnityEngine.Object;
+using UnityEditor;
+using UnityEngine.Rendering;
+using UObject = UnityEngine.Object;
 
 namespace UnityEngine.ProBuilder
 {
@@ -36,13 +38,10 @@ public Texture2D RenderLookupTexture(
                 renderCam.enabled = false;
                 renderCam.clearFlags = CameraClearFlags.SolidColor;
                 renderCam.backgroundColor = Color.white;
-#if UNITY_5_6_OR_NEWER
                 renderCam.allowHDR = false;
                 renderCam.allowMSAA = false;
                 renderCam.forceIntoRenderTexture = true;
-#endif
 
-#if UNITY_2017_1_OR_NEWER
                 RenderTextureDescriptor descriptor = new RenderTextureDescriptor()
                 {
                     width = _width,
@@ -59,16 +58,6 @@ public Texture2D RenderLookupTexture(
                     msaaSamples = 1
                 };
                 RenderTexture rt = RenderTexture.GetTemporary(descriptor);
-#else
-            RenderTexture rt = RenderTexture.GetTemporary(
-                    _width,
-                    _height,
-                    16,
-                    renderTextureFormat,
-                    RenderTextureReadWrite.Linear,
-                    1);
-#endif
-
                 RenderTexture prev = RenderTexture.active;
                 renderCam.targetTexture = rt;
                 RenderTexture.active = rt;
@@ -91,7 +80,16 @@ public Texture2D RenderLookupTexture(
                 RenderTexture.active.width));
                 */
 #endif
+
+                // URP does not support replacement shaders or custom passes from code, so for now it is necessary to
+                // force the pipeline to built-in when rendering. In editor it may be possible to use Handles.DrawCamera
+                // to avoid disposing and re-assigning the pipeline, as the RenderEditorCamera function has some logic
+                // that switches rendering path if replacement shaders are in use, but I wasn't able to get that
+                // approach to work without also requiring that the drawing happen during a repaint event.
+                var currentRenderPipeline = GraphicsSettings.renderPipelineAsset;
+                GraphicsSettings.renderPipelineAsset = null;
                 renderCam.RenderWithShader(shader, tag);
+                GraphicsSettings.renderPipelineAsset = currentRenderPipeline;
 
                 Texture2D img = new Texture2D(_width, _height, textureFormat, false, false);
                 img.ReadPixels(new Rect(0, 0, _width, _height), 0, 0);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.probuilder",
   "displayName": "ProBuilder",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "unity": "2018.3",
   "description": "Build, edit, and texture custom geometry in Unity. Use ProBuilder for in-scene level design, prototyping, collision meshes, all with on-the-fly play-testing.\n\nAdvanced features include UV editing, vertex colors, parametric shapes, and texture blending. With ProBuilder's model export feature it's easy to tweak your levels in any external 3D modelling suite.",
   "keywords": [