summaryrefslogtreecommitdiff
path: root/scene/3d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-10-05 10:27:43 -0300
committerJuan Linietsky <reduzio@gmail.com>2020-02-11 12:03:49 +0100
commit6ee2f5e6b6663f5a4987954d43bb6df6d1f62d2a (patch)
treebef9b4f01f535c8736874199b2fbd928e1000d73 /scene/3d
parent6075c5f9bf6cf3362c51e0915555361d34954215 (diff)
More GIProbe work and fixes
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/cpu_particles.cpp2
-rw-r--r--scene/3d/gi_probe.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/cpu_particles.cpp b/scene/3d/cpu_particles.cpp
index 22b453f837..5d9a791e80 100644
--- a/scene/3d/cpu_particles.cpp
+++ b/scene/3d/cpu_particles.cpp
@@ -1144,7 +1144,7 @@ void CPUParticles::_update_render_thread() {
update_mutex->lock();
#endif
if (can_update) {
- VS::get_singleton()->multimesh_set_buffer(multimesh, particle_data);
+ //VS::get_singleton()->multimesh_set_buffer(multimesh, particle_data);
can_update = false; //wait for next time
}
diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp
index 32afcc7935..52c4efb7f1 100644
--- a/scene/3d/gi_probe.cpp
+++ b/scene/3d/gi_probe.cpp
@@ -409,6 +409,7 @@ void GIProbe::bake(Node *p_from_node, bool p_create_visual_debug) {
probe_data->allocate(baker.get_to_cell_space_xform(), AABB(-extents, extents * 2.0), baker.get_giprobe_octree_size(), baker.get_giprobe_octree_cells(), baker.get_giprobe_data_cells(), baker.get_giprobe_level_cell_count());
set_probe_data(probe_data);
+ probe_data->set_edited(true); //so it gets saved
}
if (bake_end_function) {