diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-29 10:41:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 10:41:22 +0200 |
| commit | bc29f4bca158bbf3a24030cd616f162706e1646c (patch) | |
| tree | bcac4f2ce34607cad2cc1d06337c869c6b1c5321 /scene/3d/voxelizer.cpp | |
| parent | b2eb838781f2d2c323c573d4e9ebb3c47d2c6397 (diff) | |
| parent | fd30c36985c6a5de09daf897800c36acb8c2c49a (diff) | |
Merge pull request #47435 from madmiraal/rename-texture-get_data
Rename Texture.get_data() to get_image()
Diffstat (limited to 'scene/3d/voxelizer.cpp')
| -rw-r--r-- | scene/3d/voxelizer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/voxelizer.cpp b/scene/3d/voxelizer.cpp index 16718b956f..1b9ce0201f 100644 --- a/scene/3d/voxelizer.cpp +++ b/scene/3d/voxelizer.cpp @@ -344,7 +344,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material Ref<Image> img_albedo; if (albedo_tex.is_valid()) { - img_albedo = albedo_tex->get_data(); + img_albedo = albedo_tex->get_image(); mc.albedo = _get_bake_texture(img_albedo, mat->get_albedo(), Color(0, 0, 0)); // albedo texture, color is multiplicative } else { mc.albedo = _get_bake_texture(img_albedo, Color(1, 1, 1), mat->get_albedo()); // no albedo texture, color is additive @@ -358,7 +358,7 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material Ref<Image> img_emission; if (emission_tex.is_valid()) { - img_emission = emission_tex->get_data(); + img_emission = emission_tex->get_image(); } if (mat->get_emission_operator() == StandardMaterial3D::EMISSION_OP_ADD) { |