asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/okamstudio/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-05-04 23:38:10 -03:00
commit cb93e064a9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/theoraplayer/video_stream_theoraplayer.cpp
View file

@ -388,7 +388,7 @@ void VideoStreamTheoraplayer::pop_frame(Ref<ImageTexture> p_tex) {
{ {
DVector<uint8_t>::Write wr = data.write(); DVector<uint8_t>::Write wr = data.write();
uint8_t* ptr = wr.ptr(); uint8_t* ptr = wr.ptr();
memcpy(ptr, f->getBuffer(), imgsize); copymem(ptr, f->getBuffer(), imgsize);
} }
/* /*
for (int i=0; i<h; i++) { for (int i=0; i<h; i++) {

4
scene/gui/text_edit.cpp
View file

@ -489,7 +489,7 @@ void TextEdit::_notification(int p_what) {
CharType cc = text[i][j]; CharType cc = text[i][j];
//ignore any brackets inside a string //ignore any brackets inside a string
if (cc== '"' | cc == '\'') { if (cc== '"' || cc == '\'') {
CharType quotation = cc; CharType quotation = cc;
do { do {
j++; j++;
@ -560,7 +560,7 @@ void TextEdit::_notification(int p_what) {
CharType cc = text[i][j]; CharType cc = text[i][j];
//ignore any brackets inside a string //ignore any brackets inside a string
if (cc== '"' | cc == '\'') { if (cc== '"' || cc == '\'') {
CharType quotation = cc; CharType quotation = cc;
do { do {
j--; j--;