Commit: 097997c015b18dd478b26167e92f2a50fde6bdeb
Author: Pablo Dobarro
Date: Wed Apr 3 01:15:22 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB097997c015b18dd478b26167e92f2a50fde6bdeb
Fix pad error after merge
===================================================================
M source/blender/makesdna/DNA_mesh_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_mesh_types.h
b/source/blender/makesdna/DNA_mesh_types.h
index a3632412d82..098337b6431 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -191,7 +191,6 @@ typedef struct Mesh {
char _pad1[4];
/** Deprecated multiresolution modeling data, only keep for loading old
files. */
struct Multires *mr DNA_DEPRECATED;
- void *_pad1;
Mesh_Runtime runtime;
} Mesh;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
