diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-04 13:48:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-04 13:48:03 +0300 |
| commit | f430f14df4eaf6ece3ac6114a882f0fdcfa96e44 (patch) | |
| tree | 01b45ac192d6ef260d3771e1b83c1312890e3aae /source/blender/editors/space_text | |
| parent | c2ff37455ee9aaab40ed04d5537da8855f4eb7e2 (diff) | |
| parent | 7277f8973b08f847685a39b9326fc1e2fb9e268b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_text')
| -rw-r--r-- | source/blender/editors/space_text/text_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 38f0393858d..f7c3471f302 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; |