diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-05-06 03:25:12 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-05-06 03:25:12 +0400 |
commit | 8858546ab4786dbd044c5717a926440a8a839df5 (patch) | |
tree | 61b89d32fd2b4c5272826d0714089ba228a722c3 | |
parent | 405cf80eb8dc2df8ae160aee70aef34052add24a (diff) |
2.5 - Scons compiling fix for BDiego's commit
Was missing includes for blenfont module in a few places.
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/editaction_gpencil.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 16 | ||||
-rw-r--r-- | source/blender/editors/screen/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/SConscript | 2 |
6 files changed, 13 insertions, 21 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 881d2d95ca4..93bdadc27d3 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1195,7 +1195,7 @@ static int animdata_filter_dopesheet (ListBase *anim_data, bDopeSheet *ads, int if (base->object) { Object *ob= base->object; Key *key= ob_get_key(ob); - short actOk, keyOk, dataOk, matOk; + short actOk=1, keyOk=1, dataOk=1, matOk=1; /* firstly, check if object can be included, by the following fanimors: * - if only visible, must check for layer and also viewport visibility @@ -1204,8 +1204,8 @@ static int animdata_filter_dopesheet (ListBase *anim_data, bDopeSheet *ads, int */ // TODO: if cache is implemented, just check name here, and then if (filter_mode & ANIMFILTER_VISIBLE) { - /* layer visibility */ - if ((ob->lay & sce->lay)==0) continue; + /* layer visibility - we check both object and base, since these may not be in sync yet */ + if ((sce->lay & (ob->lay|base->lay))==0) continue; /* outliner restrict-flag */ if (ob->restrictflag & OB_RESTRICT_VIEW) continue; diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 5c6294022ee..e5868338f75 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -872,6 +872,7 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy glDisable(GL_LINE_SMOOTH); // smooth lines /* show info for debugging the status of gpencil */ +#if 0 if ( ((dflag & GP_DRAWDATA_NOSTATUS)==0) && (gpd->flag & GP_DATA_DISPINFO) ) { char printable[256]; short xmax; @@ -908,6 +909,7 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy BLF_draw_default(winx-xmax, winy-20, 0.0f, printable); } } +#endif /* restore initial gl conditions */ glLineWidth(1.0); 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... diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index d84b93267a6..bad86c170ab 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -522,6 +522,7 @@ static void gp_stroke_to_bonechain (bGPDlayer *gpl, bGPDstroke *gps, bArmature * } /* convert a given grease-pencil layer to a 3d-curve representation (using current view if appropriate) */ +// XXX depreceated... we now have etch-a-ton for this... static void gp_layer_to_armature (bGPdata *gpd, bGPDlayer *gpl, Scene *scene, View3D *v3d, short mode) { bGPDframe *gpf= gpencil_layer_getframe(gpl, scene->r.cfra, 0); @@ -620,21 +621,6 @@ void gpencil_convert_operation (short mode) BIF_undo_push("GPencil Convert"); } -/* display a menu for converting grease-pencil strokes */ -void gpencil_convert_menu (void) -{ - bGPdata *gpd= gpencil_data_getactive(NULL); - short mode; - - /* only show menu if it will be relevant */ - if (gpd == NULL) return; - - mode= pupmenu("Grease Pencil Convert %t|Active Layer To Path%x1|Active Layer to Bezier%x2|Active Layer to Armature%x3"); - if (mode <= 0) return; - - gpencil_convert_operation(mode); -} - /* ************************************************** */ /* GREASE-PENCIL EDITING MODE - Painting */ diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index d00c01a040c..3972efd8eed 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna' incs += ' ../../render/extern/include' incs += ' #/intern/guardedalloc #/extern/glew/include' diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 8a8c4963003..ab51068a529 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' |