[Bf-blender-cvs] [7277f8973b0] master: Fix T55260: load Text File with Python from GUI Button results in 0 User

Bastien Montagne noreply at git.blender.org
Mon Jun 4 12:47:45 CEST 2018


Commit: 7277f8973b08f847685a39b9326fc1e2fb9e268b
Author: Bastien Montagne
Date:   Mon Jun 4 12:46:59 2018 +0200
Branches: master
https://developer.blender.org/rB7277f8973b08f847685a39b9326fc1e2fb9e268b

Fix T55260: load Text File with Python from GUI Button results in 0 User

Let's just always ensure user_one when loading text from operator...

===================================================================

M	source/blender/editors/space_text/text_ops.c

===================================================================

diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index fe15d9165b7..3c2d3c557f6 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -247,15 +247,15 @@ static int text_open_exec(bContext *C, wmOperator *op)
 	/* hook into UI */
 	pprop = op->customdata;
 
+	id_us_ensure_real(&text->id);
+
 	if (pprop->prop) {
-		id_us_ensure_real(&text->id);
 		RNA_id_pointer_create(&text->id, &idptr);
 		RNA_property_pointer_set(&pprop->ptr, pprop->prop, idptr);
 		RNA_property_update(C, &pprop->ptr, pprop->prop);
 	}
 	else if (st) {
 		st->text = text;
-		id_us_ensure_real(&text->id);
 		st->left = 0;
 		st->top = 0;
 		st->scroll_accum[0] = 0.0f;



More information about the Bf-blender-cvs mailing list