[Bf-blender-cvs] [2045b4b5eff] custom-manipulators: Sync with 2.8

[Campbell Barton]

Commit: 2045b4b5eff0aca7a67b4959874f8eee5cbf62cc
Author: Campbell Barton
Date:   Tue May 30 17:40:38 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB2045b4b5eff0aca7a67b4959874f8eee5cbf62cc

Sync with 2.8

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/intern/object.c
M	source/blender/editors/object/object_shapekey.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/makesrna/intern/rna_pose.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 0ac1057cf97..44023fb4679 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -461,7 +461,6 @@ classes = (
     DATA_PT_vertex_colors,
     DATA_PT_customdata,
     DATA_PT_custom_props_mesh,
-
 )
 
 if __name__ == "__main__":  # only for live edit.
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index c03a255c3ed..116724463ca 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -184,7 +184,6 @@ struct DerivedMesh {
 	DerivedMeshType type;
 	float auto_bump_scale;
 	DMDirtyFlag dirty;
-	short totfmaps;
 	int totmat; /* total materials. Will be valid only before object drawing. */
 	struct Material **mat; /* material array. Will be valid only before object drawing */
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 86d6366daba..dd23b61f148 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -430,6 +430,7 @@ void BKE_object_free(Object *ob)
 	}
 	if (ob->mpath) {
 		animviz_free_motionpath(ob->mpath);
+		ob->mpath = NULL;
 	}
 	BKE_bproperty_free_list(&ob->prop);
 
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 853c745cb0a..e04114761e4 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -52,7 +52,6 @@
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
-#include "BKE_editmesh.h"
 #include "BKE_key.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 4e57e69db85..a4fa6e4f66b 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -9789,8 +9789,6 @@ void ED_draw_object_facemap(Scene *scene, Object *ob, const float col[4], const
 	/* add polygon offset so we draw above the original surface */
 	glPolygonOffset(1.0, 1.0);
 
-	dm->totfmaps = BLI_listbase_count(&ob->fmaps);
-
 	GPU_facemap_setup(dm);
 
 	glColor4fv(col);
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 633db984074..8d161466d56 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -833,7 +833,7 @@ static void rna_def_pose_channel(BlenderRNA *brna)
 	RNA_def_property_struct_type(prop, "PoseBone");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Child", "Child of this pose bone");
-
+	
 	/* Transformation settings */
 	prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");