Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-09-09 10:16:03 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-09-09 10:38:48 +0300
commitf8ead736a017a013777bd9e20a76b461bd990dad (patch)
tree90d1701d46fa3549f793e36d391656518739c2c2 /release/scripts/startup/bl_ui/properties_object.py
parent9bb99532a5fd2bea0d31baeced47b92b36649109 (diff)
Fix FONT objects cannot use Object Font anymore
Mistake in {rB459974896228}. To use Object Fonts, (vertex) instancing needs to be enabled. So bring back the instancing panel and improve the instancing choice (similar to rB6c0c766bcaa0) by just giving the 'Vertex' choice (or 'None') and explain this is only used for Object Fonts on characters. Was reported in D11348 itself. Differential Revision: https://developer.blender.org/D12438
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_object.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 52af4fafd09..81a641a20cf 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -267,7 +267,8 @@ class OBJECT_PT_instancing(ObjectButtonsPanel, Panel):
@classmethod
def poll(cls, context):
ob = context.object
- return (ob.type in {'MESH', 'EMPTY', 'POINTCLOUD'})
+ # FONT objects need (vertex) instancing for the 'Object Font' feature
+ return (ob.type in {'MESH', 'EMPTY', 'POINTCLOUD', 'FONT'})
def draw(self, context):
layout = self.layout