Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Jun 2018 10:48:03 +0000 (12:48 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Jun 2018 10:48:03 +0000 (12:48 +0200)
source/blender/editors/space_text/text_ops.c

index 38f0393858dfdf50ffdad06dfe439832e185d1e8..f7c3471f302e32b86bca7a8b939b3b848c772cb7 100644 (file)
@@ -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;