*/}}
Browse Source

Rack page collection & page set to hyper 1

YimingWu 1 year ago
parent
commit
4b8a883420
4 changed files with 5 additions and 5 deletions
  1. 1 1
      la_tns_kernel.c
  2. 1 1
      resources/la_nodes_basic.c
  3. 2 2
      resources/la_properties.c
  4. 1 1
      resources/la_tns_drivers.c

+ 1 - 1
la_tns_kernel.c

@@ -3457,7 +3457,7 @@ tnsObject *tnsCreateRootObject(char *name){
 
     w->ActiveRoot = o; // XXX: same here
 
-    o->Drivers=memAcquireHyper(sizeof(laRackPageCollection));
+    o->Drivers=memAcquire(sizeof(laRackPageCollection));
 
     return o;
 }

+ 1 - 1
resources/la_nodes_basic.c

@@ -898,7 +898,7 @@ void laui_LoopIndexNode(laUiList *uil, laPropPack *This, laPropPack *Extra, laCo
 
 
 int OPINV_AddInputMapperPage(laOperator* a, laEvent *e){
-    laRackPage* dp=memAcquireHyper(sizeof(laRackPage));
+    laRackPage* dp=memAcquire(sizeof(laRackPage));
     strSafeSet(&dp->Name,"New Page");
     lstAppendItem(&MAIN.InputMapping->Pages, dp);
     memAssignRef(MAIN.InputMapping,&MAIN.InputMapping->CurrentPage,dp); dp->RackType=LA_RACK_TYPE_INPUT;

+ 2 - 2
resources/la_properties.c

@@ -1064,7 +1064,7 @@ void la_RegisterInternalProps(){
             //laSubGroupDetachable(sp,laget_FirstDriverPage,laget_ListNext);
         }
 
-        p = laAddPropertyContainer("la_rack_page", "Rack Page", "A page of nodes", 0,laui_IdentifierOnly, sizeof(laRackPage), 0,0,2);{
+        p = laAddPropertyContainer("la_rack_page", "Rack Page", "A page of nodes", 0,laui_IdentifierOnly, sizeof(laRackPage), 0,0,1);{
             laPropContainerExtraFunctions(p,0,lareset_RackPage,0,0,0);
             laAddStringProperty(p, "name", "Name", "Name of the page", 0,0,0,0,1, offsetof(laRackPage, Name), 0,0,0,0,LA_AS_IDENTIFIER);
             laAddIntProperty(p,"type", "Type", "Type of the rack", 0,0,0,0,0,0,0,0,offsetof(laRackPage,RackType),0,0,0,0,0,0,0,0,0,0,LA_READ_ONLY);
@@ -1566,7 +1566,7 @@ void la_RegisterInternalProps(){
         laAddSubGroup(p, "parent", "Parent", "Object parent", "tns_object",0,0,0,offsetof(tnsObject, ParentObject), 0,0,0,0,0,0,0,LA_UDF_REFER);
         laAddSubGroup(p, "children", "Children", "The Children Of This Object", "tns_child_object",0,0,0,-1, 0,0,0,0,0,0,offsetof(tnsObject, ChildObjects), 0);
         laAddSubGroup(p, "__actions__", "Actions", "Animation actions", "la_animation_action",0,0,0,-1,0,laget_CurrentAnimationAction,0,laset_CurrentAnimationAction,0,0,offsetof(tnsObject, Actions), 0);
-        laAddSubGroup(p, "drivers", "Drivers", "Driver page collection","la_driver_collection",0,0,0,offsetof(tnsObject,Drivers),0,0,0,0,0,0,0,LA_UDF_SINGLE);
+        laAddSubGroup(p, "drivers", "Drivers", "Driver page collection","la_driver_collection",0,0,0,offsetof(tnsObject,Drivers),0,0,0,0,0,0,0,LA_UDF_SINGLE|LA_HIDE_IN_SAVE);
         laAddOperatorProperty(p, "add_driver_page", "Add Page", "Add a driver page","LA_add_driver_page",'+',0);
     }
     p = laAddPropertyContainer("tns_instancer", "Instancer", "Instance placeholder object", U'📎', tnsui_InstancerObjectProperties,sizeof(tnsInstancer), 0,0,2);{

+ 1 - 1
resources/la_tns_drivers.c

@@ -137,7 +137,7 @@ int OPCHK_AddDriverPage(laPropPack *This, laStringSplitor *ss){
 }
 int OPINV_AddDriverPage(laOperator* a, laEvent *e){
     tnsObject* ob=a->This?a->This->EndInstance:0; if(!ob || !ob->Drivers) return LA_CANCELED;
-    laRackPage* dp=memAcquireHyper(sizeof(laRackPage));
+    laRackPage* dp=memAcquire(sizeof(laRackPage));
     strSafeSet(&dp->Name,"New Page");
     lstAppendItem(&ob->Drivers->Pages, dp);
     memAssignRef(ob->Drivers,&ob->Drivers->CurrentPage,dp); dp->RackType=LA_RACK_TYPE_DRIVER;