[Bf-blender-cvs] [79d34f4fdef] custom-manipulators: Minor edits

Campbell Barton noreply at git.blender.org
Tue May 30 09:35:51 CEST 2017


Commit: 79d34f4fdef64cfaa10e353dd4a3c02e58ca262e
Author: Campbell Barton
Date:   Tue May 30 17:36:05 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB79d34f4fdef64cfaa10e353dd4a3c02e58ca262e

Minor edits

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/blender/blenkernel/intern/object.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 4b7d4907bfe..0ac1057cf97 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -78,7 +78,7 @@ class MESH_UL_vgroups(UIList):
 
 class MESH_UL_fmaps(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        # assert(isinstance(item, bpy.types.VertexGroup))
+        # assert(isinstance(item, bpy.types.FaceMap))
         fmap = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
             layout.prop(fmap, "name", text="", emboss=False, icon_value=icon)
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 59cbab2f1c0..86d6366daba 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -104,7 +104,6 @@
 #include "BKE_node.h"
 #include "BKE_object.h"
 #include "BKE_object_facemap.h"
-#include "BKE_object_deform.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"




More information about the Bf-blender-cvs mailing list