diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-27 12:06:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-27 12:06:29 +0300 |
| commit | 9a74b603670cc3fab14d9fcd7be7b3c17731a8ee (patch) | |
| tree | 0611021c1450e586308d58223353793dcc137afe /release | |
| parent | 474971f3d84e5eacde7e92fc86ef4e10a5e0786c (diff) | |
| parent | bc3727a94374d9c56745c943a1e6574627a88510 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 28e39959c7e..466e7dfa325 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -328,7 +328,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row.prop(md, "delimit") layout_info = layout - layout_info.label(text=iface_("Faces: %d") % md.face_count, translate=False) + layout_info.label(text=iface_("Face Count: {:,}".format(md.face_count)), + translate=False) def DISPLACE(self, layout, ob, md): has_texture = (md.texture is not None) diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 591180f08b4..d60710db4aa 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -229,6 +229,7 @@ shader_node_categories = [ NodeItem("ShaderNodeTexChecker"), NodeItem("ShaderNodeTexBrick"), NodeItem("ShaderNodeTexPointDensity"), + NodeItem("ShaderNodeTexIES"), ]), ShaderNodeCategory("SH_NEW_OP_COLOR", "Color", items=[ NodeItem("ShaderNodeMixRGB"), |