|
@@ -1787,7 +1787,13 @@ void tnsui_Material(laUiList *uil, laPropPack *This, laPropPack *UNUSED_Extra, l
|
|
if(!context){
|
|
if(!context){
|
|
laShowLabel(uil,cl,"Name",0,0); laShowItem(uil,cr,This,"name");
|
|
laShowLabel(uil,cl,"Name",0,0); laShowItem(uil,cr,This,"name");
|
|
}
|
|
}
|
|
- laShowLabel(uil,cl,"Color",0,0);
|
|
|
|
|
|
+ b=laBeginRow(uil,cl,0,0);
|
|
|
|
+ laShowLabel(uil,cl,"Color",0,0)->Expand=1;
|
|
|
|
+ b1=laOnConditionThat(uil,cl,laOr(laPropExpression(This,"shader_page.racks"),
|
|
|
|
+ laPropExpression(This,"shader_page.use_script")));{
|
|
|
|
+ laShowLabel(uil,cl,"🎨",0,0);
|
|
|
|
+ }laEndCondition(uil,b1);
|
|
|
|
+ laEndRow(uil,b);
|
|
laShowItemFull(uil,cr,This,"color",LA_WIDGET_FLOAT_COLOR,0,0,0)->Flags|=LA_UI_FLAGS_COLORFUL;
|
|
laShowItemFull(uil,cr,This,"color",LA_WIDGET_FLOAT_COLOR,0,0,0)->Flags|=LA_UI_FLAGS_COLORFUL;
|
|
laShowItemFull(uil,cr,This,"colorful",LA_WIDGET_ENUM_HIGHLIGHT,0,0,0);
|
|
laShowItemFull(uil,cr,This,"colorful",LA_WIDGET_ENUM_HIGHLIGHT,0,0,0);
|
|
}
|
|
}
|
|
@@ -1796,15 +1802,23 @@ void tnsui_MaterialListItem(laUiList *uil, laPropPack *This, laPropPack *UNUSED_
|
|
b=laBeginRow(uil,c,0,0);
|
|
b=laBeginRow(uil,c,0,0);
|
|
laShowItemFull(uil,c,This,"color",LA_WIDGET_FLOAT_COLOR,0,0,0)->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_ICON;
|
|
laShowItemFull(uil,c,This,"color",LA_WIDGET_FLOAT_COLOR,0,0,0)->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_ICON;
|
|
laUiItem* ui=laShowItem(uil,c,This,"name"); ui->Flags|=LA_UI_FLAGS_PLAIN; ui->Expand=1;
|
|
laUiItem* ui=laShowItem(uil,c,This,"name"); ui->Flags|=LA_UI_FLAGS_PLAIN; ui->Expand=1;
|
|
|
|
+ b1=laOnConditionThat(uil,c,laOr(laPropExpression(This,"shader_page.racks"),
|
|
|
|
+ laPropExpression(This,"shader_page.use_script")));{
|
|
|
|
+ laShowLabel(uil,c,"🎨",0,0);
|
|
|
|
+ }laEndCondition(uil,b1);
|
|
laEndRow(uil,b);
|
|
laEndRow(uil,b);
|
|
}
|
|
}
|
|
void tnsui_MaterialSlot(laUiList *uil, laPropPack *This, laPropPack *UNUSED_Extra, laColumn *UNUSED_Colums, int context){
|
|
void tnsui_MaterialSlot(laUiList *uil, laPropPack *This, laPropPack *UNUSED_Extra, laColumn *UNUSED_Colums, int context){
|
|
- laColumn* c=laFirstColumn(uil); laUiItem* b,*b1;
|
|
|
|
|
|
+ laColumn* c=laFirstColumn(uil); laUiItem* b,*b1,*b2;
|
|
b1=laOnConditionThat(uil,c,laPropExpression(This,"material"));{
|
|
b1=laOnConditionThat(uil,c,laPropExpression(This,"material"));{
|
|
b=laBeginRow(uil,c,0,0);
|
|
b=laBeginRow(uil,c,0,0);
|
|
laShowItemFull(uil,c,This,"material.color",LA_WIDGET_FLOAT_COLOR,0,0,0)
|
|
laShowItemFull(uil,c,This,"material.color",LA_WIDGET_FLOAT_COLOR,0,0,0)
|
|
->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_ICON|LA_UI_FLAGS_COLORFUL;
|
|
->Flags|=LA_UI_FLAGS_NO_EVENT|LA_UI_FLAGS_ICON|LA_UI_FLAGS_COLORFUL;
|
|
laUiItem* ui=laShowItem(uil,c,This,"material.name"); ui->Flags|=LA_UI_FLAGS_PLAIN; ui->Expand=1;
|
|
laUiItem* ui=laShowItem(uil,c,This,"material.name"); ui->Flags|=LA_UI_FLAGS_PLAIN; ui->Expand=1;
|
|
|
|
+ b2=laOnConditionThat(uil,c,laOr(laPropExpression(This,"material.shader_page.racks"),
|
|
|
|
+ laPropExpression(This,"material.shader_page.use_script")));{
|
|
|
|
+ laShowLabel(uil,c,"🎨",0,0);
|
|
|
|
+ }laEndCondition(uil,b2);
|
|
laEndRow(uil,b);
|
|
laEndRow(uil,b);
|
|
}laElse(uil,b1);{
|
|
}laElse(uil,b1);{
|
|
laShowItem(uil,c,This,"name")->Flags|=LA_UI_FLAGS_DISABLED;
|
|
laShowItem(uil,c,This,"name")->Flags|=LA_UI_FLAGS_DISABLED;
|