[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30855] trunk/blender: bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2. 5 beta release

[Campbell Barton]

Revision: 30855
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30855
Author:   campbellbarton
Date:     2010-07-29 02:44:53 +0200 (Thu, 29 Jul 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/console_python.py
    trunk/blender/source/blender/editors/space_text/text_ops.c
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py	2010-07-29 00:34:55 UTC (rev 30854)
+++ trunk/blender/release/scripts/op/console_python.py	2010-07-29 00:44:53 UTC (rev 30855)
@@ -66,9 +66,9 @@
 
         # 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

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2010-07-29 00:34:55 UTC (rev 30854)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2010-07-29 00:44:53 UTC (rev 30855)
@@ -218,7 +218,7 @@
 	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);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-07-29 00:34:55 UTC (rev 30854)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-07-29 00:44:53 UTC (rev 30855)
@@ -242,7 +242,7 @@
 					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;