Skip to content

Commit

Permalink
Merge pull request #12064 from endragor/junk-logs
Browse files Browse the repository at this point in the history
Remove junk output

[ci skip]
  • Loading branch information
akien-mga authored Oct 13, 2017
2 parents 750d75d + 6106fd8 commit e97ada6
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
4 changes: 2 additions & 2 deletions core/io/file_access_encrypted.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
writing = false;
key = p_key;
uint32_t magic = p_base->get_32();
print_line("MAGIC: " + itos(magic));
ERR_FAIL_COND_V(magic != COMP_MAGIC, ERR_FILE_UNRECOGNIZED);

mode = Mode(p_base->get_32());
ERR_FAIL_INDEX_V(mode, MODE_MAX, ERR_FILE_CORRUPT);
ERR_FAIL_COND_V(mode == 0, ERR_FILE_CORRUPT);
print_line("MODE: " + itos(mode));

unsigned char md5d[16];
p_base->get_buffer(md5d, 16);
length = p_base->get_64();
Expand Down
3 changes: 0 additions & 3 deletions modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() {
Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() {

Ref<AudioStreamPlaybackOGGVorbis> ovs;
printf("instance at %p, data %p\n", this, data);

ERR_FAIL_COND_V(data == NULL, ovs);

Expand Down Expand Up @@ -208,8 +207,6 @@ void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) {
break;
}
}

printf("create at %p, data %p\n", this, data);
}

PoolVector<uint8_t> AudioStreamOGGVorbis::get_data() const {
Expand Down
4 changes: 0 additions & 4 deletions scene/3d/particles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,6 @@ void ParticlesMaterial::finish_shaders() {

void ParticlesMaterial::_update_shader() {

print_line("updating shader");

dirty_materials.remove(&element);

MaterialKey mk = _compute_key();
Expand Down Expand Up @@ -913,9 +911,7 @@ void ParticlesMaterial::_queue_shader_change() {
if (material_mutex)
material_mutex->lock();

print_line("queuing change");
if (!element.in_list()) {
print_line("not in list, adding");
dirty_materials.add(&element);
}

Expand Down
2 changes: 0 additions & 2 deletions scene/resources/shader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ void Shader::set_code(const String &p_code) {

String type = ShaderLanguage::get_shader_type(p_code);

print_line("mode: " + type);

if (type == "canvas_item") {
mode = MODE_CANVAS_ITEM;
} else if (type == "particles") {
Expand Down

0 comments on commit e97ada6

Please sign in to comment.