fixing conflict[

wrong element reference
if mult motion elements present, was not using correct vals
2018-04-12 13:25:34 -06:00 · 2018-04-12 13:23:56 -06:00 · 2018-04-12 06:03:15 -06:00 · 2018-04-08 06:45:29 -06:00 · 2018-04-08 06:11:22 -06:00 · 2018-04-07 08:40:46 -06:00
1 changed files with 2 additions and 2 deletions
@@ -570,8 +570,8 @@ void apply_motion_parameters(flam3_xform *xf, flam3_xform *addto, double blend)
   /* Loop over the motion elements and add their contribution to the original vals */
   for (i=0; i<xf->num_motion; i++) {   
-      freq = mot[i]->motion_freq;
+      freq = mot[i].motion_freq;
-      func = mot[i]->motion_func;
+      func = mot[i].motion_func;
      APPMOT(density); /* Must ensure > 0 after all is applied */
      APPMOT(color); /* Must ensure [0,1] after all is applied */
Author	SHA1	Message	Date
EReckase	dd35aba4f4	fixing conflict[	2018-04-12 13:25:34 -06:00
EReckase	8735697ace	wrong element reference	2018-04-12 13:23:56 -06:00
EReckase	5e0e265181	if mult motion elements present, was not using correct vals	2018-04-12 06:03:15 -06:00
EReckase	80283c4eb9	Merge branch 'master' of https://github.com/scottdraves/flam3 into erik_dev	2018-04-08 06:45:29 -06:00
EReckase	7d9423e34f	color speed is a motion element variable	2018-04-08 06:11:22 -06:00
kitchenstaff	8631217337	localhost	2018-04-07 08:40:46 -06:00
kitchenstaff	63cb87f8ad	aclocal needed refresh	2018-04-07 08:40:07 -06:00
kitchenstaff	33afe587ad	libtool update after configure	2018-04-07 08:37:31 -06:00
kitchenstaff	ccdee7340a	updated for aclocal 1.15	2018-04-07 08:29:27 -06:00