diff options
| author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-17 23:38:33 -0300 |
|---|---|---|
| committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-17 23:38:33 -0300 |
| commit | 4452e262539ad9d52a5980305584d897829986d1 (patch) | |
| tree | cde7f3bdc36e727a21f55938a131083f84e043a6 /scene/3d | |
| parent | 68fb30aaea0acf3ff279831d2d77b2e7129e4b69 (diff) | |
| parent | 97f483af0a3e040f73c2df957bd092af2f6c085b (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/baked_light_instance.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/collision_polygon.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/baked_light_instance.cpp b/scene/3d/baked_light_instance.cpp index b55093a779..1ae7866f0b 100644 --- a/scene/3d/baked_light_instance.cpp +++ b/scene/3d/baked_light_instance.cpp @@ -81,7 +81,7 @@ float BakedLightSampler::get_param(Param p_param) const{ void BakedLightSampler::set_resolution(int p_resolution){ - ERR_FAIL_COND(p_resolution<4 && p_resolution>32); + ERR_FAIL_COND(p_resolution<4 || p_resolution>32); resolution=p_resolution; VS::get_singleton()->baked_light_sampler_set_resolution(base,resolution); } diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index c857b4851a..bb0a1fca12 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -126,7 +126,7 @@ void CollisionPolygon::_notification(int p_what) { } break; case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: { - if (!can_update_body && shape_from>=0 && shape_from>=0) { + if (!can_update_body && shape_from>=0 && shape_to>=0) { CollisionObject *co = get_parent()->cast_to<CollisionObject>(); if (co) { |