[Bf-blender-cvs] [f8d0447dfb7] blender2.8: CoW: Skip used pointers in MetaBall edit mode.
Germano
noreply at git.blender.org
Mon May 28 18:47:26 CEST 2018
Commit: f8d0447dfb7cbbfe4a8a29c4e7d23bb5890e421f
Author: Germano
Date: Mon May 28 13:04:21 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBf8d0447dfb7cbbfe4a8a29c4e7d23bb5890e421f
CoW: Skip used pointers in MetaBall edit mode.
===================================================================
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 3cc17542487..88e5814baa6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -77,6 +77,7 @@ extern "C" {
# include "DNA_lattice_types.h"
# include "DNA_linestyle_types.h"
# include "DNA_material_types.h"
+# include "DNA_meta_types.h"
# include "DNA_node_types.h"
# include "DNA_texture_types.h"
# include "DNA_world_types.h"
@@ -429,6 +430,14 @@ void updata_curve_edit_mode_pointers(const Depsgraph * /*depsgraph*/,
curve_cow->editfont = curve_orig->editfont;
}
+void update_mball_edit_mode_pointers(const Depsgraph * /*depsgraph*/,
+ const ID *id_orig, ID *id_cow)
+{
+ const MetaBall *mball_orig = (const MetaBall *)id_orig;
+ MetaBall *mball_cow = (MetaBall *)id_cow;
+ mball_cow->editelems = mball_orig->editelems;
+}
+
void updata_mesh_edit_mode_pointers(const Depsgraph *depsgraph,
const ID *id_orig, ID *id_cow)
{
@@ -468,6 +477,9 @@ void updata_edit_mode_pointers(const Depsgraph *depsgraph,
case ID_CU:
updata_curve_edit_mode_pointers(depsgraph, id_orig, id_cow);
break;
+ case ID_MB:
+ update_mball_edit_mode_pointers(depsgraph, id_orig, id_cow);
+ break;
default:
break;
}
@@ -815,6 +827,12 @@ void discard_curve_edit_mode_pointers(ID *id_cow)
curve_cow->editfont = NULL;
}
+void discard_mball_edit_mode_pointers(ID *id_cow)
+{
+ MetaBall *mball_cow = (MetaBall *)id_cow;
+ mball_cow->editelems = NULL;
+}
+
void discard_mesh_edit_mode_pointers(ID *id_cow)
{
Mesh *mesh_cow = (Mesh *)id_cow;
@@ -842,6 +860,9 @@ void discard_edit_mode_pointers(ID *id_cow)
case ID_CU:
discard_curve_edit_mode_pointers(id_cow);
break;
+ case ID_MB:
+ discard_mball_edit_mode_pointers(id_cow);
+ break;
default:
break;
}
More information about the Bf-blender-cvs
mailing list