From cad078d85d97bc4befff6868cd212c09ecde94e5 Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Tue, 24 Dec 2019 15:07:00 -0800
Subject: [PATCH] Add new properties

---
 __init__.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/__init__.py b/__init__.py
index bb84d0d..5f6d3a2 100644
--- a/__init__.py
+++ b/__init__.py
@@ -465,8 +465,6 @@ class TexToolsSettings(bpy.types.PropertyGroup):
         min = 1,
         max = 16
     )
-
-
     bake_ray_distance : bpy.props.FloatProperty(
         name = "Ray Dist.",
         description = "Ray distance when baking. When using cage used as extrude distance",
@@ -479,6 +477,16 @@ class TexToolsSettings(bpy.types.PropertyGroup):
         description="Force a single texture bake accross all selected objects",
         default = False
     )
+    bake_exclude_others: bpy.props.BoolProperty(
+        name="Exclude Others",
+        description="Exclude deselected objects when rendering",
+        default = False
+    )
+    bake_merge_object: bpy.props.BoolProperty(
+        name="Merge Objects",
+        description="Merge selected objects when rendering, results in significantly lower bake times",
+        default = False
+    )
     bake_sampling : bpy.props.EnumProperty(items= 
         [('1', 'None', 'No Anti Aliasing (Fast)'), 
         ('2', '2x', 'Render 2x and downsample'),