Commit: ae0f75b56d3697ad9aee636219db01d89440cb61
Author: Campbell Barton
Date: Fri Mar 31 20:37:32 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rBae0f75b56d3697ad9aee636219db01d89440cb61
Merge branch 'blender2.8' into custom-manipulators
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_data_mesh.py
index 86b857650d0,cbd86bb8860..3c3db39814d
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@@ -238,50 -227,9 +238,50 @@@ class DATA_PT_vertex_groups(MeshButtons
layout.prop(context.tool_settings, "vertex_group_weight",
text="Weight")
+class DATA_PT_face_maps(MeshButtonsPanel, Panel):
+ bl_label = "Face Maps"
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+
+ @classmethod
+ def poll(cls, context):
+ obj = context.object
+ return (obj and obj.type == 'MESH')
+
+ def draw(self, context):
+ layout = self.layout
+
+ ob = context.object
+ facemap = ob.face_maps.active
+
+ rows = 2
+ if facemap:
+ rows = 4
+
+ row = layout.row()
+ row.template_list("MESH_UL_fmaps", "", ob, "face_maps", ob.face_maps,
"active_index", rows=rows)
+
+ col = row.column(align=True)
+ col.operator("object.face_map_add", icon='ZOOMIN', text="")
+ col.operator("object.face_map_remove", icon='ZOOMOUT', text="")
+ if facemap:
+ col.separator()
+ col.operator("object.face_map_move", icon='TRIA_UP',
text="").direction = 'UP'
+ col.operator("object.face_map_move", icon='TRIA_DOWN',
text="").direction = 'DOWN'
+
+ if ob.face_maps and (ob.mode == 'EDIT' and ob.type == 'MESH'):
+ row = layout.row()
+
+ sub = row.row(align=True)
+ sub.operator("object.face_map_assign", text="Assign")
+ sub.operator("object.face_map_remove_from", text="Remove")
+
+ sub = row.row(align=True)
+ sub.operator("object.face_map_select", text="Select")
+ sub.operator("object.face_map_deselect", text="Deselect")
+
class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
bl_label = "Shape Keys"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY'}
@classmethod
def poll(cls, context):
diff --cc source/blender/editors/space_view3d/space_view3d.c
index 0ca33943db9,7920631b100..2bb0e9bad0b
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -931,10 -894,18 +931,20 @@@ static void view3d_main_region_listener
break;
case NC_GEOM:
switch (wmn->data) {
- case ND_DATA:
- case ND_VERTEX_GROUP:
case ND_SELECT:
+ {
+ WM_manipulatormap_tag_refresh(mmap);
++
+ if (scene->obedit) {
+ Object *ob = scene->obedit;
+ if (ob->type == OB_MESH) {
+ struct Mesh *me =
ob->data;
+
BKE_mesh_batch_selection_dirty(me);
+ }
+ }
+ }
+ case ND_DATA:
+ case ND_VERTEX_GROUP:
ED_region_tag_redraw(ar);
break;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
