fix rendering crashes
1) introduce can_regenerate so we only regenerate when necessary 2) no notifications of missing glyphs when rendering 3) use frame_change_pre instead of post
This commit is contained in:
parent
2422d0cf09
commit
7ebe913e49
2 changed files with 18 additions and 17 deletions
14
__init__.py
14
__init__.py
|
@ -180,7 +180,7 @@ class ABC3D_text_properties(bpy.types.PropertyGroup):
|
|||
|
||||
def glyphs_update_callback(self, context):
|
||||
butils.prepare_text(self.font_name, self.face_name, self.text)
|
||||
butils.set_text_on_curve(self)
|
||||
butils.set_text_on_curve(self, can_regenerate=True)
|
||||
|
||||
def update_callback(self, context):
|
||||
butils.set_text_on_curve(self)
|
||||
|
@ -1321,8 +1321,8 @@ class ABC3D_OT_PlaceText(bpy.types.Operator):
|
|||
# t['font'] = self.font # enums want to be set as attribute
|
||||
t["font_name"] = self.font_name
|
||||
t["face_name"] = self.face_name
|
||||
t.text_object = selected
|
||||
t["text"] = self.text
|
||||
t["text_object"] = selected
|
||||
t.text = self.text
|
||||
t["letter_spacing"] = self.letter_spacing
|
||||
t["font_size"] = self.font_size
|
||||
t["offset"] = self.offset
|
||||
|
@ -1911,8 +1911,8 @@ def register():
|
|||
# and autostart if we reload script
|
||||
load_handler(None, None)
|
||||
|
||||
if on_frame_changed not in bpy.app.handlers.frame_change_post:
|
||||
bpy.app.handlers.frame_change_post.append(on_frame_changed)
|
||||
if on_frame_changed not in bpy.app.handlers.frame_change_pre:
|
||||
bpy.app.handlers.frame_change_pre.append(on_frame_changed)
|
||||
|
||||
if on_depsgraph_update not in bpy.app.handlers.depsgraph_update_post:
|
||||
bpy.app.handlers.depsgraph_update_post.append(on_depsgraph_update)
|
||||
|
@ -1938,8 +1938,8 @@ def unregister():
|
|||
# and when reload script
|
||||
load_handler_unload()
|
||||
|
||||
if on_frame_changed in bpy.app.handlers.frame_change_post:
|
||||
bpy.app.handlers.frame_change_post.remove(on_frame_changed)
|
||||
if on_frame_changed in bpy.app.handlers.frame_change_pre:
|
||||
bpy.app.handlers.frame_change_pre.remove(on_frame_changed)
|
||||
|
||||
if on_depsgraph_update in bpy.app.handlers.depsgraph_update_post:
|
||||
bpy.app.handlers.depsgraph_update_post.remove(on_depsgraph_update)
|
||||
|
|
21
butils.py
21
butils.py
|
@ -777,7 +777,7 @@ def is_bezier(curve):
|
|||
return True
|
||||
|
||||
|
||||
def will_regenerate(text_properties):
|
||||
def would_regenerate(text_properties):
|
||||
mom = text_properties.text_object
|
||||
|
||||
if len(text_properties.text) != len(text_properties.glyphs):
|
||||
|
@ -843,7 +843,7 @@ def parent_to_curve(o, c):
|
|||
p = cm.vertices[0].co
|
||||
o.matrix_parent_inverse.translation = p * -1.0
|
||||
|
||||
def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4):
|
||||
def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4, can_regenerate=False):
|
||||
"""set_text_on_curve
|
||||
|
||||
An earlier reset cancels the other.
|
||||
|
@ -879,7 +879,7 @@ def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4)
|
|||
# elif distribution_type == "FOLLOW_PATH":
|
||||
# mom.data.use_path = True
|
||||
|
||||
regenerate = will_regenerate(text_properties)
|
||||
regenerate = can_regenerate and would_regenerate(text_properties)
|
||||
|
||||
# if we regenerate.... delete objects
|
||||
if regenerate and text_properties.get("glyphs"):
|
||||
|
@ -954,12 +954,13 @@ def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4)
|
|||
message = message + f" (replaced with '{possible_replacement}')"
|
||||
replaced = True
|
||||
|
||||
ShowMessageBox(
|
||||
title="Glyph replaced" if replaced else "Glyph missing",
|
||||
icon="INFO" if replaced else "ERROR",
|
||||
message=message,
|
||||
prevent_repeat=True,
|
||||
)
|
||||
if can_regenerate:
|
||||
ShowMessageBox(
|
||||
title="Glyph replaced" if replaced else "Glyph missing",
|
||||
icon="INFO" if replaced else "ERROR",
|
||||
message=message,
|
||||
prevent_repeat=True,
|
||||
)
|
||||
if not replaced:
|
||||
continue
|
||||
|
||||
|
@ -997,6 +998,7 @@ def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4)
|
|||
inner_node.parent = outer_node
|
||||
inner_node.matrix_parent_inverse = outer_node.matrix_world.inverted()
|
||||
parent_to_curve(outer_node, mom)
|
||||
outer_node.hide_set(True)
|
||||
|
||||
glyph_properties["glyph_object"] = outer_node
|
||||
else:
|
||||
|
@ -1079,7 +1081,6 @@ def set_text_on_curve(text_properties, reset_timeout_s=0.1, reset_depsgraph_n=4)
|
|||
inner_node.rotation_mode = previous_inner_node_rotation_mode
|
||||
|
||||
# outer_node.hide_viewport = True
|
||||
outer_node.hide_set(True)
|
||||
|
||||
############### PREPARE FOR THE NEXT
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue