Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-05-06 03:25:12 +0400
committerJoshua Leung <aligorith@gmail.com>2009-05-06 03:25:12 +0400
commit8858546ab4786dbd044c5717a926440a8a839df5 (patch)
tree61b89d32fd2b4c5272826d0714089ba228a722c3 /source/blender/editors/gpencil/editaction_gpencil.c
parent405cf80eb8dc2df8ae160aee70aef34052add24a (diff)
2.5 - Scons compiling fix for BDiego's commit
Was missing includes for blenfont module in a few places.
Diffstat (limited to 'source/blender/editors/gpencil/editaction_gpencil.c')
-rw-r--r--source/blender/editors/gpencil/editaction_gpencil.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index 8be56dc416e..beb4ed06810 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -66,6 +66,8 @@
#include "gpencil_intern.h"
+#if 0 // XXX disabled until grease pencil code stabilises again
+
/* XXX */
static void actdata_filter() {} // is now ANIM_animdata_filter()
static void BIF_undo_push() {}
@@ -505,7 +507,8 @@ void paste_gpdata (Scene *scene)
ScrArea *sa;
/* get area that gp-data comes from */
- sa= gpencil_data_findowner((bGPdata *)ale->owner);
+ //sa= gpencil_data_findowner((bGPdata *)ale->owner);
+ sa = NULL;
/* this should be the right frame... as it may be a pre-existing frame,
* must make sure that only compatible stroke types get copied over
@@ -736,3 +739,4 @@ void mirror_gplayer_frames (bGPDlayer *gpl, Scene *scene, short mode)
}
/* ***************************************** */
+#endif // XXX disabled until Grease Pencil code stabilises again...