[Bf-blender-cvs] [f974f6c9b2e] soc-2019-bevel-profiles: Addressed final comments

Hans Goudey noreply at git.blender.org
Wed Nov 20 20:14:59 CET 2019


Commit: f974f6c9b2e82c2133a800ab723f6fbdc2955107
Author: Hans Goudey
Date:   Wed Nov 20 14:14:46 2019 -0500
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rBf974f6c9b2e82c2133a800ab723f6fbdc2955107

Addressed final comments

===================================================================

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/blenkernel/BKE_curveprofile.h

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index ee5ee7b8129..9c51324e463 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -162,7 +162,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.label(text="Miter Type:")
         layout.row().prop(md, "miter_outer", text="Outer")
         layout.row().prop(md, "miter_inner", text="Inner")
-        if md.miter_inner == 'MITER_PATCH' or md.miter_inner == 'MITER_ARC':
+        if md.miter_inner in {'MITER_PATCH', 'MITER_ARC'}
             layout.row().prop(md, "spread")
 
         layout.label(text="Limit Method:")
diff --git a/source/blender/blenkernel/BKE_curveprofile.h b/source/blender/blenkernel/BKE_curveprofile.h
index a7b53212476..1f6659d785a 100644
--- a/source/blender/blenkernel/BKE_curveprofile.h
+++ b/source/blender/blenkernel/BKE_curveprofile.h
@@ -17,8 +17,8 @@
  * All rights reserved.
  */
 
-#ifndef __BKE_PROFILEPATH_H__
-#define __BKE_PROFILEPATH_H__
+#ifndef __BKE_CURVEPROFILE_H__
+#define __BKE_CURVEPROFILE_H__
 
 /** \file
  * \ingroup bke



More information about the Bf-blender-cvs mailing list