bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

bugfix [#23062] Resolve conflict button in text editor dissappers in Blener 2.5 beta release

Browse Source 
also uncommented console some code for testing by mistake & remove warning.
This commit is contained in:
Campbell Barton 2010-07-29 00:44:53 +00:00
parent 7ef2e33ea3
commit 88cbcb0206
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/op/console_python.py
View 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

2
source/blender/editors/space_text/text_ops.c
View 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);

2
source/blender/makesrna/intern/rna_modifier.c
View 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;