forked from bartvdbraak/blender
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.
This commit is contained in:
parent
7ef2e33ea3
commit
88cbcb0206
@ -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
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user