浏览代码

RichTextLabel: On custom effect change, parse bbcode only if it's enabled and not empty.

(cherry picked from commit 9f73abfa9f927ed6109b46991517f824b2ba318e)
bruvzg 4 年之前
父节点
当前提交
d844e72157
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      scene/gui/rich_text_label.cpp

+ 6 - 2
scene/gui/rich_text_label.cpp

@@ -2706,7 +2706,9 @@ void RichTextLabel::set_effects(const Vector<Variant> &effects) {
 		custom_effects.push_back(effect);
 		custom_effects.push_back(effect);
 	}
 	}
 
 
-	parse_bbcode(bbcode);
+	if ((bbcode != "") && use_bbcode) {
+		parse_bbcode(bbcode);
+	}
 }
 }
 
 
 Vector<Variant> RichTextLabel::get_effects() {
 Vector<Variant> RichTextLabel::get_effects() {
@@ -2723,7 +2725,9 @@ void RichTextLabel::install_effect(const Variant effect) {
 
 
 	if (rteffect.is_valid()) {
 	if (rteffect.is_valid()) {
 		custom_effects.push_back(effect);
 		custom_effects.push_back(effect);
-		parse_bbcode(bbcode);
+		if ((bbcode != "") && use_bbcode) {
+			parse_bbcode(bbcode);
+		}
 	}
 	}
 }
 }