Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 17 Jul 2018 11:58:26 +0000 (13:58 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 17 Jul 2018 11:58:26 +0000 (13:58 +0200)
1  2 
source/blender/blenkernel/intern/ipo.c

index b7ca73e9f4a44837a4457fe56ca2f5917e76bb75,fd8cb6d6d98ba692ac564a6e7fea1466c2be5aca..3be40b414a684be6f2ed8f84802cdbbf004fef69
@@@ -1751,8 -1765,25 +1750,8 @@@ void do_versions_ipos_to_animato(Main *
                        /* IPO second... */
                        if (ob->ipo) {
                                ipo_to_animdata(bmain, id, ob->ipo, NULL, NULL, NULL);
-                               id_us_min(&ob->ipo->id);
+                               /* No need to id_us_min ipo ID here, ipo_to_animdata already does it. */
                                ob->ipo = NULL;
 -
 -                              {
 -                                      /* If we have any empty action actuators, assume they were
 -                                       * converted IPO Actuators using the object IPO */
 -                                      bActuator *act;
 -                                      bActionActuator *aa;
 -
 -                                      for (act = ob->actuators.first; act; act = act->next) {
 -                                              /* Any actuators set to ACT_IPO at this point are actually Action Actuators that
 -                                               * need this converted IPO to finish converting the actuator. */
 -                                              if (act->type == ACT_IPO) {
 -                                                      aa = (bActionActuator *)act->data;
 -                                                      aa->act = ob->adt->action;
 -                                                      act->type = ACT_ACTION;
 -                                              }
 -                                      }
 -                              }
                        }
                }