bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 29 Jul 2010 00:44:53 +0000 (00:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 29 Jul 2010 00:44:53 +0000 (00:44 +0000)
also uncommented console some code for testing by mistake & remove warning.

release/scripts/op/console_python.py
source/blender/editors/space_text/text_ops.c
source/blender/makesrna/intern/rna_modifier.c

index 3c6e52e..2881e87 100644 (file)
@@ -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
index 91fb616..25726ba 100644 (file)
@@ -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);
 
index f4398b9..4ace614 100644 (file)
@@ -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;