diff options
| author | hurikhan | 2015-01-11 08:06:31 +0800 |
|---|---|---|
| committer | hurikhan | 2015-01-11 08:06:31 +0800 |
| commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
| tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /servers/visual/rasterizer.cpp | |
| parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
| parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) | |
| download | godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.tar.gz godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.tar.zst godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.zip | |
Merge branch 'master' into x11-fullscreen
Diffstat (limited to 'servers/visual/rasterizer.cpp')
| -rw-r--r-- | servers/visual/rasterizer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp index b5e74e0f2..c3dcd83a3 100644 --- a/servers/visual/rasterizer.cpp +++ b/servers/visual/rasterizer.cpp @@ -568,8 +568,9 @@ void Rasterizer::_update_fixed_materials() { } material_set_param(fm.self,_fixed_material_uv_xform_name,fm.uv_xform); - if (fm.use_pointsize) + if (fm.use_pointsize) { material_set_param(fm.self,_fixed_material_point_size_name,fm.point_size); + } } fixed_material_dirty_list.remove(fixed_material_dirty_list.first()); @@ -620,6 +621,8 @@ Rasterizer::Rasterizer() { _fixed_material_uv_xform_name="fmp_uv_xform"; _fixed_material_point_size_name="fmp_point_size"; + draw_viewport_func=NULL; + ERR_FAIL_COND( sizeof(FixedMaterialShaderKey)!=4); } |