Revision: 17806
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17806
Author: ton
Date: 2008-12-12 19:47:12 +0100 (Fri, 12 Dec 2008)
Log Message:
-----------
2.5
- Added rudimentary support for Ipo window
(Joshua can check on view2d issues for this? :)
- removed ED_area.h, added ED_space_api.h
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_api/space.c
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_ipo/Makefile
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/makesdna/DNA_screen_types.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_intern.h
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/include/ED_area.h
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -5063,10 +5063,30 @@
/* 2.50 patch */
static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
{
- ARegion *ar= MEM_callocN(sizeof(ARegion), "area region from
do_versions");
+ ARegion *ar;
+ if(sl) {
+ /* first channels for ipo action nla... */
+ switch(sl->spacetype) {
+ case SPACE_IPO:
+ ar= MEM_callocN(sizeof(ARegion), "area region
from do_versions");
+ BLI_addtail(lb, ar);
+ ar->regiontype= RGN_TYPE_CHANNELS;
+ ar->alignment= RGN_ALIGN_RIGHT;
+
+ break;
+ case SPACE_ACTION:
+ break;
+ case SPACE_NLA:
+ break;
+ }
+ }
+ /* main region */
+ ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
+
BLI_addtail(lb, ar);
ar->winrct= sa->totrct;
+
ar->regiontype= RGN_TYPE_WINDOW;
if(sl) {
@@ -5097,19 +5117,19 @@
ar->v2d.min[1]= ar->v2d.max[1]= 500.0;
}
break;
+ case SPACE_IPO:
+ {
+ SpaceIpo *sipo= (SpaceIpo *)sl;
+ memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D));
+
+ ar->v2d.scroll=
(V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
+ ar->v2d.scroll |=
(V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT);
+
+ }
//case SPACE_XXX: // FIXME... add other ones
// memcpy(&ar->v2d, &((SpaceXxx
*)sl)->v2d, sizeof(View2D));
// break;
}
- /* further subdivision case, channels for ipo action nla... */
- switch(sl->spacetype) {
- case SPACE_IPO:
- break;
- case SPACE_ACTION:
- break;
- case SPACE_NLA:
- break;
- }
}
}
Deleted: branches/blender2.5/blender/source/blender/editors/include/ED_area.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_area.h
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_area.h
2008-12-12 18:47:12 UTC (rev 17806)
@@ -1,40 +0,0 @@
-/**
- * $Id:
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef ED_AREA_H
-#define ED_AREA_H
-
-/* the pluginnable API for export to editors */
-
-/* calls for registering default spaces */
-void ED_spacetype_outliner(void);
-void ED_spacetype_time(void);
-void ED_spacetype_view3d(void);
-
-#endif /* ED_AREA_H */
-
Copied:
branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h (from
rev 17802, branches/blender2.5/blender/source/blender/editors/include/ED_area.h)
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
2008-12-12 18:47:12 UTC (rev 17806)
@@ -0,0 +1,41 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef ED_AREA_H
+#define ED_AREA_H
+
+/* the pluginnable API for export to editors */
+
+/* calls for registering default spaces */
+void ED_spacetype_outliner(void);
+void ED_spacetype_time(void);
+void ED_spacetype_view3d(void);
+void ED_spacetype_ipo(void);
+
+#endif /* ED_AREA_H */
+
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -39,7 +39,6 @@
#include "BKE_screen.h"
#include "BKE_utildefines.h"
-#include "ED_area.h"
#include "ED_screen.h"
#include "ED_screen_types.h"
@@ -385,7 +384,7 @@
sa->type= BKE_spacetype_from_id(sa->spacetype);
if(sa->type==NULL) {
- sa->spacetype= SPACE_VIEW3D;
+ sa->butspacetype= sa->spacetype= SPACE_VIEW3D;
sa->type= BKE_spacetype_from_id(sa->spacetype);
}
Modified:
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -44,7 +44,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_area.h"
#include "ED_screen.h"
#include "ED_screen_types.h"
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -38,7 +38,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_area.h"
#include "ED_markers.h"
#include "ED_screen.h"
#include "ED_screen_types.h"
Modified: branches/blender2.5/blender/source/blender/editors/space_api/space.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_api/space.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/space_api/space.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -37,7 +37,6 @@
#include "BKE_global.h"
#include "BKE_screen.h"
-#include "ED_area.h"
#include "ED_screen.h"
/* */
Modified:
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -38,7 +38,7 @@
#include "BIF_gl.h"
#include "ED_screen.h"
-#include "ED_area.h"
+#include "ED_space_api.h"
ARegionType *ED_regiontype_from_id(SpaceType *st, int regionid)
@@ -64,7 +64,7 @@
ED_spacetype_outliner();
ED_spacetype_time();
ED_spacetype_view3d();
-// ED_spacetype_ipo();
+ ED_spacetype_ipo();
// ...
/* register operator types for screen and all spaces */
Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/Makefile
2008-12-12 18:31:34 UTC (rev 17805)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/Makefile
2008-12-12 18:47:12 UTC (rev 17806)
@@ -35,6 +35,7 @@
CFLAGS += $(LEVEL_1_C_WARNINGS)
+CPPFLAGS += -I$(NAN_GLEW)/include
CPPFLAGS += -I$(OPENGL_HEADERS)
# not very neat....
Added: branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/SConscript
2008-12-12 18:47:12 UTC (rev 17806)
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' #/intern/guardedalloc #/extern/glew/include'
+
+env.BlenderLib ( 'bf_editors_space_ipo', sources, Split(incs), [],
libtype=['core','intern'], priority=[35, 40] )
Added: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c
2008-12-12 18:47:12 UTC (rev 17806)
@@ -0,0 +1,166 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
