From 88cbcb0206b7f727b24c6018a24dc1c1a08e9531 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Jul 2010 00:44:53 +0000 Subject: [PATCH] bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta release also uncommented console some code for testing by mistake & remove warning. --- release/scripts/op/console_python.py | 6 +++--- source/blender/editors/space_text/text_ops.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/scripts/op/console_python.py b/release/scripts/op/console_python.py index 3c6e52e28cd..2881e87fe00 100644 --- a/release/scripts/op/console_python.py +++ b/release/scripts/op/console_python.py @@ -66,9 +66,9 @@ def get_console(console_id): # XXX, bug in python 3.1.2 ? (worked in 3.1.1) # seems there is no way to clear StringIO objects for writing, have to make new ones each time. - # import io - # stdout = io.StringIO() - # stderr = io.StringIO() + import io + stdout = io.StringIO() + stderr = io.StringIO() else: if _BPY_MAIN_OWN: import types diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 91fb616a63f..25726bae84b 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -218,7 +218,7 @@ static int open_exec(bContext *C, wmOperator *op) PropertyPointerRNA *pprop; PointerRNA idptr; char str[FILE_MAX]; - short internal = RNA_int_get(op->ptr, "internal"); + short internal = RNA_boolean_get(op->ptr, "internal"); RNA_string_get(op->ptr, "filepath", str); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index f4398b99beb..4ace614640c 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -242,7 +242,7 @@ static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) break; if(ob->type == OB_MESH && !psys) { /* add particle system */ - psmd = object_add_particle_system(scene, ob, NULL); + psmd = (ParticleSystemModifierData *)object_add_particle_system(scene, ob, NULL); if(psmd) { psys = psmd->psys;