[Bf-blender-cvs] [7c8e6048b3a] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 7c8e6048b3a95c9c5ca2902da4511c6453e14973
Author: Bastien Montagne
Date:   Tue Jul 17 13:58:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7c8e6048b3a95c9c5ca2902da4511c6453e14973

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/ipo.c
index b7ca73e9f4a,fd8cb6d6d98..3be40b414a6
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@@ -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;
 -						}
 -					}
 -				}
  			}
  		}