From ca8312dce81ff4011ace1bff61799a33d625d45c Mon Sep 17 00:00:00 2001 From: hgn Date: Fri, 6 Oct 2023 09:31:21 +0100 Subject: [PATCH] fix menu rendering regression --- blender_export.py | 7 ++++--- entity.h | 1 + menu.h | 12 +++++++----- models_src/rs_menu.mdl | Bin 3255960 -> 3255960 bytes 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/blender_export.py b/blender_export.py index 239bfd0..db6e97c 100644 --- a/blender_export.py +++ b/blender_export.py @@ -1328,7 +1328,7 @@ def sr_compile_menus( collection ): sr_compile_mesh_internal( obj ) #} - if item.type == 1 or item.type == 2:#{ + if item.type == 1 or item.type == 2 or item.type == 7:#{ item_button = item._anonymous_union.button item_button.pstr = sr_compile_string( obj_data.string ) item_button.stack_behaviour = int( obj_data.stack_behaviour ) @@ -3174,7 +3174,8 @@ class SR_OBJECT_ENT_MENU_ITEM(bpy.types.PropertyGroup): ('3','toggle', ''), ('4','slider',''), ('5','page',''), - ('6','binding','')]) + ('6','binding',''), + ('7','visual(no colourize)','')]) @staticmethod def sr_inspector( layout, data ): @@ -3183,7 +3184,7 @@ class SR_OBJECT_ENT_MENU_ITEM(bpy.types.PropertyGroup): box = layout.box() box.prop( data, 'tipo' ) - if data.tipo == '0':#{ + if data.tipo == '0' or data.tipo == '7':#{ box.prop( data, 'string', text='Name' ) return #} diff --git a/entity.h b/entity.h index 103e1a2..4046452 100644 --- a/entity.h +++ b/entity.h @@ -300,6 +300,7 @@ enum ent_menuitem_type{ k_ent_menuitem_type_slider = 4, k_ent_menuitem_type_page = 5, k_ent_menuitem_type_binding = 6, + k_ent_menuitem_type_visual_nocol = 7, k_ent_menuitem_type_disabled = 90 }; diff --git a/menu.h b/menu.h index 0985706..86f5736 100644 --- a/menu.h +++ b/menu.h @@ -430,7 +430,8 @@ static void menu_update(void){ ent_menuitem *item = mdl_arritm( &menu.items, i ); if( item->type == k_ent_menuitem_type_page ) continue; - if( item->type == k_ent_menuitem_type_visual ) continue; + if( (item->type == k_ent_menuitem_type_visual) || + (item->type == k_ent_menuitem_type_visual_nocol) ) continue; if( item->type == k_ent_menuitem_type_binding ) continue; if( !(item->groups & (0x1<type != k_ent_menuitem_type_page) && (item->type != k_ent_menuitem_type_visual) && + (item->type != k_ent_menuitem_type_visual_nocol) && (item->groups & (0x1<type == k_ent_menuitem_type_visual ){ + if( item->type == k_ent_menuitem_type_visual_nocol ){ shader_model_menu_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} ); } else{ diff --git a/models_src/rs_menu.mdl b/models_src/rs_menu.mdl index 9a91088cda66d7abb1cfc8c48b5cc71f26fc5d8c..eb04eb092b8b909295dbecd5c5e1885849e6c764 100644 GIT binary patch delta 12802 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 delta 12756 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 -- 2.25.1