[Bf-blender-cvs] [7aedfd6] master: Fix T41778: Crash on animate boids xith a goal

Campbell Barton noreply at git.blender.org
Thu Sep 11 04:52:56 CEST 2014


Commit: 7aedfd654bc1cba8b73be42a6938dc9857876069
Author: Campbell Barton
Date:   Thu Sep 11 12:49:46 2014 +1000
Branches: master
https://developer.blender.org/rB7aedfd654bc1cba8b73be42a6938dc9857876069

Fix T41778: Crash on animate boids xith a goal

No need to copy/restore entire object struct (just to read location)

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

M	source/blender/blenkernel/intern/effect.c

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

diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 4859aa8..24ee470 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -630,8 +630,7 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin
 	}
 	else {
 		/* use center of object for distance calculus */
-		Object *ob = eff->ob;
-		Object obcopy = *ob;
+		const Object *ob = eff->ob;
 
 		/* use z-axis as normal*/
 		normalize_v3_v3(efd->nor, ob->obmat[2]);
@@ -654,8 +653,6 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin
 		if (real_velocity)
 			copy_v3_v3(efd->vel, eff->velocity);
 
-		*eff->ob = obcopy;
-
 		efd->size = 0.0f;
 
 		ret = 1;




More information about the Bf-blender-cvs mailing list