[Bf-blender-cvs] [6e9cccc91f6] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu Feb 27 17:49:13 CET 2020


Commit: 6e9cccc91f6f152d808bd8def56fdd30ee60b002
Author: Antonio Vazquez
Date:   Thu Feb 27 17:49:07 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6e9cccc91f6f152d808bd8def56fdd30ee60b002

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/object.c
index f35d8b32f83,4d7d5861a09..e363477176e
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -3936,9 -3946,10 +3957,9 @@@ void BKE_object_runtime_reset(Object *o
  void BKE_object_runtime_reset_on_copy(Object *object, const int UNUSED(flag))
  {
    Object_Runtime *runtime = &object->runtime;
-   runtime->mesh_eval = NULL;
+   runtime->data_eval = NULL;
    runtime->mesh_deform_eval = NULL;
    runtime->curve_cache = NULL;
 -  runtime->gpencil_cache = NULL;
  }
  
  /*



More information about the Bf-blender-cvs mailing list