Orange bugfix; using in NLA window the Ckey option (Convert to NLA), did
authorTon Roosendaal <ton@blender.org>
Fri, 16 Dec 2005 12:49:42 +0000 (12:49 +0000)
committerTon Roosendaal <ton@blender.org>
Fri, 16 Dec 2005 12:49:42 +0000 (12:49 +0000)
not use the proper call to increase user count && set the action to get
a tag "extern linked". This caused actions to get lost when indirectly
linked from library files.

source/blender/src/editnla.c
source/blender/src/toets.c

index 49455f392ca3adac3f73c77d0d1ba38306601573..7708b699b52356da6ab2c546534c317e3800fec3 100644 (file)
@@ -351,7 +351,7 @@ static void convert_nla(short mval[2])
                        
                        /* Link the action to the nstrip */
                        nstrip->act = base->object->action;
-                       nstrip->act->id.us++;
+                       id_us_plus(&nstrip->act->id);
                        calc_action_range(nstrip->act, &nstrip->actstart, &nstrip->actend);
                        nstrip->start = nstrip->actstart;
                        nstrip->end = nstrip->actend;
index 0fee06a65d835d92436bb7bea9b381a50dd9afac..bb8e433251b109426571d584fb700691a5a23be3 100644 (file)
@@ -981,7 +981,8 @@ int blenderqread(unsigned short event, short val)
                                                screen_swapbuffers();
                                        }
                                        else if(event==3) {
-                                               BKE_write_undo("10 timer");
+                                               BIF_undo();
+                                               BIF_redo();
                                        }
                                }
                        
@@ -989,8 +990,7 @@ int blenderqread(unsigned short event, short val)
                                
                                if(event==1) sprintf(tmpstr, "draw %%t|%d ms", time);
                                if(event==2) sprintf(tmpstr, "d+sw %%t|%d ms", time);
-                               if(event==3) sprintf(tmpstr, "displist %%t|%d ms", time);
-                               if(event==4) sprintf(tmpstr, "undo %%t|%d ms", time);
+                               if(event==3) sprintf(tmpstr, "undo %%t|%d ms", time);
                        
                                waitcursor(0);
                                pupmenu(tmpstr);