[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33693] trunk/blender/source/blender: ensure pasted graph keys are always selected.

Campbell Barton ideasman42 at gmail.com
Wed Dec 15 18:36:08 CET 2010


Revision: 33693
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33693
Author:   campbellbarton
Date:     2010-12-15 18:36:08 +0100 (Wed, 15 Dec 2010)

Log Message:
-----------
ensure pasted graph keys are always selected.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/editors/animation/keyframes_general.c
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/modifiers/intern/MOD_smoke.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-12-15 17:05:34 UTC (rev 33692)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-12-15 17:36:08 UTC (rev 33693)
@@ -975,7 +975,6 @@
 					{
 						ParticleSimulationData sim;
 						ParticleSystem *psys = sfs->psys;
-						ParticleSettings *part=psys->part;
 						int p = 0;								
 						float *density = smoke_get_density(sds->fluid);								
 						float *bigdensity = smoke_turbulence_get_density(sds->wt);								

Modified: trunk/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-12-15 17:05:34 UTC (rev 33692)
+++ trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-12-15 17:36:08 UTC (rev 33693)
@@ -515,7 +515,7 @@
 	for (ale= anim_data->first; ale; ale= ale->next) {
 		FCurve *fcu= (FCurve *)ale->key_data;
 		tAnimCopybufItem *aci;
-		BezTriple *bezt, *newbuf;
+		BezTriple *bezt, *nbezt, *newbuf;
 		int i;
 		
 		/* firstly, check if F-Curve has any selected keyframes
@@ -546,8 +546,14 @@
 					memcpy(newbuf, aci->bezt, sizeof(BezTriple)*(aci->totvert));
 				
 				/* copy current beztriple across too */
-				*(newbuf + aci->totvert)= *bezt; 
-				
+				nbezt= &newbuf[aci->totvert];
+				*nbezt= *bezt;
+
+				/* ensure copy buffer is selected so pasted keys are selected */
+				nbezt->f1 |= SELECT;
+				nbezt->f2 |= SELECT;
+				nbezt->f3 |= SELECT;
+
 				/* free old array and set the new */
 				if (aci->bezt) MEM_freeN(aci->bezt);
 				aci->bezt= newbuf;

Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c	2010-12-15 17:05:34 UTC (rev 33692)
+++ trunk/blender/source/blender/editors/animation/keyframing.c	2010-12-15 17:36:08 UTC (rev 33693)
@@ -229,6 +229,10 @@
 				dst->vec[0][1] += dy;
 				dst->vec[1][1] += dy;
 				dst->vec[2][1] += dy;
+
+				dst->f1= bezt->f1;
+				dst->f2= bezt->f2;
+				dst->f3= bezt->f3;
 				
 				// TODO: perform some other operations?
 			}

Modified: trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smoke.c	2010-12-15 17:05:34 UTC (rev 33692)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smoke.c	2010-12-15 17:36:08 UTC (rev 33693)
@@ -98,7 +98,7 @@
 
 static void updateDepgraph(ModifierData *md, DagForest *forest,
 						struct Scene *scene,
-						Object *ob,
+						Object *UNUSED(ob),
 						DagNode *obNode)
 {
 	SmokeModifierData *smd = (SmokeModifierData *) md;





More information about the Bf-blender-cvs mailing list