diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 10:36:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 10:36:49 +0300 |
commit | 9bdd12d884c5130397e67f72caad2770d9524c9a (patch) | |
tree | f26951742aadf0c14810ed581bad9393cc2d23ec /release/scripts/startup/bl_ui | |
parent | d99532e1d8fd49019003046dcf471c85a52e0398 (diff) | |
parent | d1dc5e0a53c5a3484b7d20eb3a9847b53a227791 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_constraint.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_armature.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 00892d5f85b..9b61101778f 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -886,10 +886,10 @@ class ConstraintButtonsPanel: box.template_cache_file(con, "cache_file") cache_file = con.cache_file - + layout.label(text="Constraint Properties:") box = layout.box() - + if cache_file is not None: box.prop_search(con, "object_path", cache_file, "object_paths") diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index caef60980aa..4ce2d97d2a0 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -180,7 +180,7 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): if poselib: # warning about poselib being in an invalid state if len(poselib.fcurves) > 0 and len(poselib.pose_markers) == 0: - layout.label(icon='ERROR', text="Error: Potentially corrupt library, run 'Sanitize' operator to fix") + layout.label(icon='ERROR', text="Error: Potentially corrupt library, run 'Sanitize' operator to fix") # list of poses in pose library row = layout.row() |