(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -522,15 +522,9 @@ namespace Barotrauma
                }
            }
        }
-
-        // The value should always be copied from the prefab. Editing is enabled only for testing the scale in the sub editor (changes are not saved).
-
-#if DEBUG
+        
        [Serialize(1f, false), Editable(0.1f, 10f, DecimalCount = 3, ValueStep = 0.1f)]
-#else
-        [Serialize(1f, false)]
-#endif
-        public float Scale { get; set; } = 1;
+        public virtual float Scale { get; set; } = 1;
        #endregion
    }
 }