diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-20 23:55:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-20 23:55:08 -0300 |
| commit | f6a790d58c596773466437140f6d7e2a6a29e5e7 (patch) | |
| tree | b1b01c575e83cd77b8607771d7d745aeac75c308 /platform | |
| parent | d241b2ec1b97366791ed64f882e6e6b0e302bc9b (diff) | |
| parent | b5011d9bf1dea0e16b5b15da82f6110c4055ad09 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/flash/rasterizer_flash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/flash/rasterizer_flash.h b/platform/flash/rasterizer_flash.h index af231f7954..1a2c540faa 100644 --- a/platform/flash/rasterizer_flash.h +++ b/platform/flash/rasterizer_flash.h @@ -577,7 +577,7 @@ class RasterizerFlash : public Rasterizer { } } else { - return B->material->shader_cache < B->material->shader_cache; + return A->material->shader_cache < B->material->shader_cache; } } }; |