[Bf-blender-cvs] [366f2646ec1] temp-modifiers-instancing: Merge branch 'geometry-nodes' into temp-modifiers-instancing

[Jacques Lucke]

Commit: 366f2646ec1c31dd4643697869511463f629fffa
Author: Jacques Lucke
Date:   Thu Nov 12 11:29:01 2020 +0100
Branches: temp-modifiers-instancing
https://developer.blender.org/rB366f2646ec1c31dd4643697869511463f629fffa

Merge branch 'geometry-nodes' into temp-modifiers-instancing

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/object.c
index ce5fabfa605,5b0b1f333f4..2b6355f4b1d
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -4880,9 -4868,10 +4880,11 @@@ void BKE_object_runtime_reset_on_copy(O
  {
    Object_Runtime *runtime = &object->runtime;
    runtime->data_eval = NULL;
+   runtime->gpd_eval = NULL;
    runtime->mesh_deform_eval = NULL;
    runtime->curve_cache = NULL;
+   runtime->object_as_temp_mesh = NULL;
 +  runtime->geometry_set_eval = NULL;
  }
  
  /**