[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38103] branches/soc-2011-pepper/source/ blender/editors/transform/transform_conversions.c: Bugfix #27856: Transforming Grease Pencil frames in Action Editor

[Joshua Leung]

Revision: 38103
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38103
Author:   aligorith
Date:     2011-07-05 01:54:01 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Bugfix #27856: Transforming Grease Pencil frames in Action Editor
didn't perform updates

* This problem was caused by a typo when adapting old code
* Fixed crash where keyframes-update was being called in Grease Pencil
transforms too

Todo:
Outliner/Datablocks Viewer doesn't update that nicely when these
keyframes get modified. Outside of gdb, I managed to get a few non-
repeatable crashes here; while debugging though, there was only some
lagging oddness if panning before the tree updated.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/editors/transform/transform_conversions.c

Modified: branches/soc-2011-pepper/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-pepper/source/blender/editors/transform/transform_conversions.c	2011-07-05 01:49:34 UTC (rev 38102)
+++ branches/soc-2011-pepper/source/blender/editors/transform/transform_conversions.c	2011-07-05 01:54:01 UTC (rev 38103)
@@ -2681,7 +2681,7 @@
 static void posttrans_gpd_clean (bGPdata *gpd)
 {
 	bGPDlayer *gpl;
-
+	
 	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
 		ListBase sel_buffer = {NULL, NULL};
 		bGPDframe *gpf, *gpfn;
@@ -4844,7 +4844,7 @@
 				// XXX: BAD! this get gpencil datablocks directly from main db...
 				// but that's how this currently works :/
 				for (gpd = G.main->gpencil.first; gpd; gpd = gpd->id.next) {
-					if (ID_REAL_USERS(gpd) > 1)
+					if (ID_REAL_USERS(gpd))
 						posttrans_gpd_clean(gpd);
 				}
 			}
@@ -4872,7 +4872,8 @@
 		}
 		
 		/* make sure all F-Curves are set correctly */
-		ANIM_editkeyframes_refresh(&ac);
+		if (ac.datatype != ANIMCONT_GPENCIL)
+			ANIM_editkeyframes_refresh(&ac);
 		
 		/* clear flag that was set for time-slide drawing */
 		saction->flag &= ~SACTION_MOVING;