Merged changes in the trunk up to revision 26439.

source/blender/python/intern/bpy_interface.c

@@ -238,6 +238,7 @@ static void bpy_init_modules( void )
 		sprintf(tmpstr, "%d.%02d (sub %d)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
 		PyModule_AddStringConstant(mod, "_VERSION_STR",  tmpstr);
 		PyModule_AddStringConstant(mod, "_BINPATH",  bprogname);
+		PyModule_AddIntConstant(mod, "_DEBUG",  G.f & G_DEBUG ? 1:0);
 	}
 
 	/* add our own modules dir, this is a python package */

source/blender/python/intern/bpy_rna.c

@@ -3575,11 +3575,12 @@ PyObject *BPY_rna_types(void)
 	}
 	
 	self= (BPy_BaseTypeRNA *)PyObject_NEW( BPy_BaseTypeRNA, &pyrna_basetype_Type );
-	
+	self->arraydim = self->arrayoffset = 0; /* unused but better set */
+
 	/* avoid doing this lookup for every getattr */
 	RNA_blender_rna_pointer_create(&self->ptr);
 	self->prop = RNA_struct_find_property(&self->ptr, "structs");
-	
+
 	return (PyObject *)self;
 }