Revision: 20075
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20075
Author: aligorith
Date: 2009-05-06 01:25:12 +0200 (Wed, 06 May 2009)
Log Message:
-----------
2.5 - Scons compiling fix for BDiego's commit
Was missing includes for blenfont module in a few places.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
branches/blender2.5/blender/source/blender/editors/screen/SConscript
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
2009-05-05 23:15:31 UTC (rev 20074)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
2009-05-05 23:25:12 UTC (rev 20075)
@@ -1195,7 +1195,7 @@
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 @@
*/
// 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;
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
2009-05-05 23:15:31 UTC (rev 20074)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
2009-05-05 23:25:12 UTC (rev 20075)
@@ -872,6 +872,7 @@
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 @@
BLF_draw_default(winx-xmax, winy-20, 0.0f, printable);
}
}
+#endif
/* restore initial gl conditions */
glLineWidth(1.0);
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
2009-05-05 23:15:31 UTC (rev 20074)
+++
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
2009-05-05 23:25:12 UTC (rev 20075)
@@ -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 @@
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 @@
}
/* ***************************************** */
+#endif // XXX disabled until Grease Pencil code stabilises again...
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
2009-05-05 23:15:31 UTC (rev 20074)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
2009-05-05 23:25:12 UTC (rev 20075)
@@ -522,6 +522,7 @@
}
/* 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 @@
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 */
Modified: branches/blender2.5/blender/source/blender/editors/screen/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/SConscript
2009-05-05 23:15:31 UTC (rev 20074)
+++ branches/blender2.5/blender/source/blender/editors/screen/SConscript
2009-05-05 23:25:12 UTC (rev 20075)
@@ -3,7 +3,7 @@
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'
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
2009-05-05 23:15:31 UTC (rev 20074)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
2009-05-05 23:25:12 UTC (rev 20075)
@@ -3,7 +3,7 @@
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'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
