Commit: a1a4f587262b6947c0766c62a1ddc37b5b6996bf
Author: Campbell Barton
Date: Sat Apr 8 12:33:18 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBa1a4f587262b6947c0766c62a1ddc37b5b6996bf
Add back widgets accidentally lost in merge (facemaps usable again)
===================================================================
M release/scripts/startup/bl_ui/properties_data_bone.py
M release/scripts/startup/bl_ui/properties_data_mesh.py
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py
b/release/scripts/startup/bl_ui/properties_data_bone.py
index e3baa4caed3..090371f2e64 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -486,6 +486,7 @@ classes = (
BONE_PT_transform_locks,
BONE_PT_curved,
BONE_PT_relations,
+ BONE_PT_facemaps,
BONE_PT_display,
BONE_PT_inverse_kinematics,
BONE_PT_deform,
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py
b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 672a011717a..fe55bc61dd7 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -448,17 +448,20 @@ classes = (
MESH_MT_vertex_group_specials,
MESH_MT_shape_key_specials,
MESH_UL_vgroups,
+ MESH_UL_fmaps,
MESH_UL_shape_keys,
MESH_UL_uvmaps_vcols,
DATA_PT_context_mesh,
DATA_PT_normals,
DATA_PT_texture_space,
DATA_PT_vertex_groups,
+ DATA_PT_face_maps,
DATA_PT_shape_keys,
DATA_PT_uv_texture,
DATA_PT_vertex_colors,
DATA_PT_customdata,
DATA_PT_custom_props_mesh,
+
)
if __name__ == "__main__": # only for live edit.
diff --git a/source/blender/editors/space_view3d/space_view3d.c
b/source/blender/editors/space_view3d/space_view3d.c
index af25c9de781..7aa0067eab7 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -736,6 +736,10 @@ static void view3d_widgets(void)
wmManipulatorMapType *wmaptype =
WM_manipulatormaptype_ensure(&wmap_params);
WM_manipulatorgrouptype_append(wmaptype, TRANSFORM_WGT_manipulator);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_armature_facemaps);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_lamp);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_force_field);
+ WM_manipulatorgrouptype_append(wmaptype, VIEW3D_WGT_camera);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
