diff options
| -rw-r--r-- | doc/python_api/rst/change_log.rst | 44 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 6 |
2 files changed, 24 insertions, 26 deletions
diff --git a/doc/python_api/rst/change_log.rst b/doc/python_api/rst/change_log.rst index 3b7635f4bfb..8ed161a236b 100644 --- a/doc/python_api/rst/change_log.rst +++ b/doc/python_api/rst/change_log.rst @@ -1042,26 +1042,6 @@ Added * :class:`bpy.types.Texture.evaluate` -bpy.types.MeshTextureFace -------------------------- - -Removed -^^^^^^^ - -* **blend_type** -* **hide** -* **use_alpha_sort** -* **use_billboard** -* **use_bitmap_text** -* **use_blend_shared** -* **use_collision** -* **use_halo** -* **use_image** -* **use_light** -* **use_object_color** -* **use_shadow_cast** -* **use_twoside** - bpy.types.ToolSettings ---------------------- @@ -1400,3 +1380,27 @@ Added * :class:`bpy.types.SceneGameData.restrict_animation_updates` * :class:`bpy.types.SceneGameData.show_obstacle_simulation` +bpy.types.MeshTextureFace +------------------------- + +Removed +^^^^^^^ + +* **use_image** +* **use_object_color** +* **use_blend_shared** + +Moved +^^^^^ + +* **hide** -> :class:`bpy.types.Material.game_settings.invisible` +* **use_collision** -> :class:`bpy.types.Material.game_settings.physics` +* **use_light** -> :class:`bpy.types.Material.game_settings.use_shadeless` +* **use_twoside** -> :class:`bpy.types.Material.game_settings.back_culling` +* **use_bitmap_text** -> :class:`bpy.types.Material.game_settings.text` +* **blend_type** -> :class:`bpy.types.Material.game_settings.alpha_blend` +* **use_alpha_sort** -> :class:`bpy.types.Material.game_settings.alpha_blend` +* **use_billboard** -> :class:`bpy.types.Material.game_settings.face_orientation` +* **use_halo** -> :class:`bpy.types.Material.game_settings.face_orientation` +* **use_shadow_cast** -> :class:`bpy.types.Material.game_settings.face_orientation` + diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index a43aa709dd6..00c79c32b3a 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1366,12 +1366,6 @@ static void rna_def_mtface(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - static const EnumPropertyItem transp_items[]= { - {TF_SOLID, "OPAQUE", 0, "Opaque", "Render color of textured face as color"}, - {TF_ADD, "ADD", 0, "Add", "Render face transparent and add color of face"}, - {TF_ALPHA, "ALPHA", 0, "Alpha", "Render polygon transparent, depending on alpha channel of the texture"}, - {TF_CLIP, "CLIPALPHA", 0, "Clip Alpha", "Use the images alpha values clipped with no blending (binary alpha)"}, - {0, NULL, 0, NULL, NULL}}; const int uv_dim[]= {4, 2}; srna= RNA_def_struct(brna, "MeshTextureFaceLayer", NULL); |