[Bf-blender-cvs] [d36756f] hair_system: Merge branch 'hair_immediate_fixes' into hair_system_solver

[Lukas Tönne]

Commit: d36756f8459be63433eb14eeeefd5127a63edc22
Author: Lukas Tönne
Date:   Sat Oct 4 11:17:35 2014 +0200
Branches: hair_system
https://developer.blender.org/rBd36756f8459be63433eb14eeeefd5127a63edc22

Merge branch 'hair_immediate_fixes' into hair_system_solver

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



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

diff --cc source/blender/blenkernel/intern/object.c
index f4d12ae,1a32471..4b22888
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -1302,9 -1295,9 +1302,10 @@@ static ParticleSystem *copy_particlesys
  	if (psysn->clmd) {
  		psysn->clmd->point_cache = psysn->pointcache;
  	}
 +#endif
  
  	id_us_plus((ID *)psysn->part);
+ 	id_us_plus((ID *)psysn->key);
  
  	return psysn;
  }