godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert cause of #22794

Browse Source
This commit is contained in:
Mariusz Chwalba 2018-10-06 12:30:45 +02:00
parent f12cb82e0f
commit 99d9af4fba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gdscript/gdscript_function.cpp
View File

@ -673,7 +673,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
OPCODE(OPCODE_SET_MEMBER) { OPCODE(OPCODE_SET_MEMBER) {
CHECK_SPACE(3); CHECK_SPACE(3);
#ifdef DEBUG_ENABLED
int indexname = _code_ptr[ip + 1]; int indexname = _code_ptr[ip + 1];
GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count); GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count);
const StringName *index = &_global_names_ptr[indexname]; const StringName *index = &_global_names_ptr[indexname];
@ -681,6 +680,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
bool valid; bool valid;
bool ok = ClassDB::set_property(p_instance->owner, *index, *src, &valid); bool ok = ClassDB::set_property(p_instance->owner, *index, *src, &valid);
#ifdef DEBUG_ENABLED
if (!ok) { if (!ok) {
err_text = "Internal error setting property: " + String(*index); err_text = "Internal error setting property: " + String(*index);
OPCODE_BREAK; OPCODE_BREAK;
@ -696,13 +696,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
OPCODE(OPCODE_GET_MEMBER) { OPCODE(OPCODE_GET_MEMBER) {
CHECK_SPACE(3); CHECK_SPACE(3);
#ifdef DEBUG_ENABLED
int indexname = _code_ptr[ip + 1]; int indexname = _code_ptr[ip + 1];
GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count); GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count);
const StringName *index = &_global_names_ptr[indexname]; const StringName *index = &_global_names_ptr[indexname];
GET_VARIANT_PTR(dst, 2); GET_VARIANT_PTR(dst, 2);
bool ok = ClassDB::get_property(p_instance->owner, *index, *dst); bool ok = ClassDB::get_property(p_instance->owner, *index, *dst);
#ifdef DEBUG_ENABLED
if (!ok) { if (!ok) {
err_text = "Internal error getting property: " + String(*index); err_text = "Internal error getting property: " + String(*index);
OPCODE_BREAK; OPCODE_BREAK;
@ -749,13 +749,13 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
OPCODE(OPCODE_ASSIGN_TYPED_BUILTIN) { OPCODE(OPCODE_ASSIGN_TYPED_BUILTIN) {
CHECK_SPACE(4); CHECK_SPACE(4);
Variant::Type var_type = (Variant::Type)_code_ptr[ip + 1];
GET_VARIANT_PTR(dst, 2); GET_VARIANT_PTR(dst, 2);
GET_VARIANT_PTR(src, 3); GET_VARIANT_PTR(src, 3);
#ifdef DEBUG_ENABLED
Variant::Type var_type = (Variant::Type)_code_ptr[ip + 1];
GD_ERR_BREAK(var_type < 0 || var_type >= Variant::VARIANT_MAX); GD_ERR_BREAK(var_type < 0 || var_type >= Variant::VARIANT_MAX);
#ifdef DEBUG_ENABLED
if (src->get_type() != var_type) { if (src->get_type() != var_type) {
if (Variant::can_convert_strict(src->get_type(), var_type)) { if (Variant::can_convert_strict(src->get_type(), var_type)) {
Variant::CallError ce; Variant::CallError ce;