Page MenuHome
Files F2698

outliner_hs_02.patch
Public
Actions

outliner_hs_02.patch
View Options

Index: source/blender/blenkernel/intern/effect.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/effect.c,v
retrieving revision 1.94
diff -u -r1.94 effect.c
--- source/blender/blenkernel/intern/effect.c 17 Jun 2006 15:14:43 -0000 1.94
+++ source/blender/blenkernel/intern/effect.c 19 Jun 2006 06:26:59 -0000
@@ -1673,7 +1673,7 @@
if(paf->keys) MEM_freeN(paf->keys); /* free as early as possible, for returns */
paf->keys= NULL;
- printf("build particles\n");
+ //printf("build particles\n"); // print disabled by Aligorith. Annoying.
// FSPARTICLE all own created...
if( (1) && (ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) &&
Index: source/blender/include/BIF_outliner.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/BIF_outliner.h,v
retrieving revision 1.12
diff -u -r1.12 BIF_outliner.h
--- source/blender/include/BIF_outliner.h 28 Jan 2006 18:33:13 -0000 1.12
+++ source/blender/include/BIF_outliner.h 13 Jun 2006 11:11:23 -0000
@@ -81,6 +81,7 @@
extern void outliner_toggle_selected(struct ScrArea *sa);
extern void outliner_operation_menu(struct ScrArea *sa);
extern void outliner_page_up_down(struct ScrArea *sa, int up);
+extern void outliner_page_left_right(struct ScrArea *sa, int right);
#endif
Index: source/blender/python/api2_2x/Object.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/Object.c,v
retrieving revision 1.194
diff -u -r1.194 Object.c
--- source/blender/python/api2_2x/Object.c 12 Jun 2006 20:01:17 -0000 1.194
+++ source/blender/python/api2_2x/Object.c 13 Jun 2006 09:08:00 -0000
@@ -81,6 +81,7 @@
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
+#include "BDR_drawobject.h"
#include "BDR_editobject.h"
#include "BDR_editcurve.h"
Index: source/blender/python/api2_2x/meshPrimitive.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/meshPrimitive.c,v
retrieving revision 1.1
diff -u -r1.1 meshPrimitive.c
--- source/blender/python/api2_2x/meshPrimitive.c 25 May 2006 16:45:23 -0000 1.1
+++ source/blender/python/api2_2x/meshPrimitive.c 5 Jun 2006 10:01:57 -0000
@@ -96,7 +96,7 @@
rename_id( &me->id, name );
obj->mesh = me;
obj->object = NULL;
- obj->new = 1;
+ //obj->new = 1; // commented out so it will compile. Might not work now. Aligorith
return (PyObject *) obj;
}
Index: source/blender/src/drawipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawipo.c,v
retrieving revision 1.83
diff -u -r1.83 drawipo.c
--- source/blender/src/drawipo.c 15 Jun 2006 14:22:59 -0000 1.83
+++ source/blender/src/drawipo.c 16 Jun 2006 07:02:12 -0000
@@ -2440,10 +2440,10 @@
cursor = BC_NSEW_SCROLLCURSOR;
/* no x move in outliner */
- if(curarea->spacetype==SPACE_OOPS && G.v2d->scroll) {
+ /*if(curarea->spacetype==SPACE_OOPS && G.v2d->scroll) {
facx= 0.0;
cursor = BC_NS_SCROLLCURSOR;
- }
+ } */
/* no y move in audio & time */
if ELEM(curarea->spacetype, SPACE_SOUND, SPACE_TIME) {
Index: source/blender/src/editmesh_mods.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editmesh_mods.c,v
retrieving revision 1.99
diff -u -r1.99 editmesh_mods.c
--- source/blender/src/editmesh_mods.c 20 Jun 2006 00:30:10 -0000 1.99
+++ source/blender/src/editmesh_mods.c 20 Jun 2006 06:23:57 -0000
@@ -1488,7 +1488,7 @@
static void mouse_mesh_loop(void)
{
EditEdge *eed;
- int select;
+ int select= 0;
short dist= 50;
eed= findnearestedge(&dist);
Index: source/blender/src/editmesh_tools.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editmesh_tools.c,v
retrieving revision 1.149
diff -u -r1.149 editmesh_tools.c
--- source/blender/src/editmesh_tools.c 8 Jun 2006 05:41:57 -0000 1.149
+++ source/blender/src/editmesh_tools.c 8 Jun 2006 10:05:12 -0000
@@ -5895,7 +5895,7 @@
}
static void collapse_edgeuvs(void){
- EditEdge *eed;
+ //EditEdge *eed;
ListBase uvedges, uvverts, allcollections;
wUVEdge *curwedge;
wUVNode *curwnode;
Index: source/blender/src/header_image.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_image.c,v
retrieving revision 1.57
diff -u -r1.57 header_image.c
--- source/blender/src/header_image.c 12 Jun 2006 14:39:08 -0000 1.57
+++ source/blender/src/header_image.c 13 Jun 2006 09:08:18 -0000
@@ -66,7 +66,7 @@
#include "BIF_drawimage.h"
#include "BIF_editsima.h"
#include "BIF_interface.h"
-#include "BIF_previewrender.h"
+#include "BIF_previewrender.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_space.h"
Index: source/blender/src/interface_icons.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/interface_icons.c,v
retrieving revision 1.13
diff -u -r1.13 interface_icons.c
--- source/blender/src/interface_icons.c 15 Jun 2006 11:23:51 -0000 1.13
+++ source/blender/src/interface_icons.c 16 Jun 2006 06:59:40 -0000
@@ -80,6 +80,7 @@
#include "BIF_previewrender.h"
#include "BIF_screen.h"
#include "BIF_resources.h" /* elubie: should be removed once the enum for the ICONS is in BIF_preview_icons.h */
+#include "BIF_screen.h" /* Aligorith: added to satisfy compiler*/
#include "interface.h"
Index: source/blender/src/outliner.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/outliner.c,v
retrieving revision 1.63
diff -u -r1.63 outliner.c
--- source/blender/src/outliner.c 5 Apr 2006 17:21:24 -0000 1.63
+++ source/blender/src/outliner.c 20 Jun 2006 06:14:59 -0000
@@ -946,6 +946,20 @@
scrarea_queue_redraw(sa);
}
+void outliner_page_left_right(ScrArea *sa, int right)
+{
+ SpaceOops *soops= sa->spacedata.first;
+ int dx= soops->v2d.mask.xmax-soops->v2d.mask.xmin;
+
+ if(right == -1) dx= -dx;
+ if (soops->v2d.cur.xmin+dx >= 0) {
+ soops->v2d.cur.xmin+= dx;
+ soops->v2d.cur.xmax+= dx;
+ }
+
+ scrarea_queue_redraw(sa);
+}
+
/* **** do clicks on items ******* */
static void tree_element_active_object(SpaceOops *soops, TreeElement *te)
@@ -1571,17 +1585,20 @@
{
SpaceOops *so= sa->spacedata.first;
TreeElement *te;
- int ytop;
+ int xleft,ytop;
if(OBACT == NULL) return;
te= outliner_find_id(so, &so->tree, (ID *)OBACT);
if(te) {
/* make te->ys center of view */
+ xleft= te->xs ; // fixme
ytop= te->ys + (so->v2d.mask.ymax-so->v2d.mask.ymin)/2;
if(ytop>0) ytop= 0;
so->v2d.cur.ymax= ytop;
so->v2d.cur.ymin= ytop-(so->v2d.mask.ymax-so->v2d.mask.ymin);
+ so->v2d.cur.xmax= xleft+(so->v2d.mask.xmax-so->v2d.mask.xmin); // need to write code to do this
+ so->v2d.cur.xmin= xleft; // need to write code to do this. fixme
scrarea_queue_redraw(sa);
}
}
@@ -2417,7 +2434,8 @@
/* selection status */
if(tselem->flag & TSE_SELECTED) {
- glRecti(0, *starty+1, (int)soops->v2d.mask.xmax, *starty+OL_H-1);
+ //glRecti(0, *starty+1, (int)soops->v2d.mask.xmax, *starty+OL_H-1);
+ glRecti(soops->v2d.cur.xmin, *starty+1, (int)soops->v2d.cur.xmax, *starty+OL_H-1);
}
*starty-= OL_H;
if((tselem->flag & TSE_CLOSED)==0) outliner_draw_selection(soops, &te->subtree, starty);
@@ -2446,12 +2464,12 @@
// grey hierarchy lines
BIF_ThemeColorBlend(TH_BACK, TH_TEXT, 0.5);
starty= soops->v2d.tot.ymax-OL_H/2;
- startx= 6;
+ startx= 6;
outliner_draw_hierarchy(soops, &soops->tree, startx, &starty);
// items themselves
starty= soops->v2d.tot.ymax-OL_H;
- startx= 0;
+ startx= 0;
for(te= soops->tree.first; te; te= te->next) {
outliner_draw_tree_element(soops, te, startx, &starty);
}
@@ -2467,7 +2485,8 @@
ystart= OL_H*(ystart/(OL_H));
while(ystart > soops->v2d.cur.ymin) {
- glRecti(0, ystart, (int)soops->v2d.mask.xmax, ystart+OL_H);
+ //glRecti(0, ystart, (int)soops->v2d.mask.xmax, ystart+OL_H);
+ glRecti((int)soops->v2d.cur.xmin, ystart, (int)soops->v2d.cur.xmax, ystart+OL_H); // Aligorith: attempt to make infinite. mask or something else more suitble?
ystart-= 2*OL_H;
}
}
@@ -2617,9 +2636,19 @@
G.v2d->cur.ymax= 0.0;
G.v2d->cur.ymin= -(G.v2d->mask.ymax-G.v2d->mask.ymin);
}
-
+
myortho2(G.v2d->cur.xmin-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-0.375, G.v2d->cur.ymax-0.375);
-
+
+ /* prevent scrolls from going too far */
+ if (G.v2d->cur.xmin < 0) {
+ G.v2d->cur.xmin= 0.0;
+ G.v2d->cur.xmax= (G.v2d->mask.xmax-G.v2d->mask.xmin);
+ }
+ else if (G.v2d->cur.ymax > 0) {
+ G.v2d->cur.ymin= -(G.v2d->mask.ymax-G.v2d->mask.ymin);
+ G.v2d->cur.ymax= 0.0;
+ }
+
/* draw outliner stuff */
outliner_back(soops);
outliner_draw_tree(soops);
@@ -2628,7 +2657,7 @@
mywinset(sa->win);
/* ortho corrected */
- myortho2(G.v2d->cur.xmin-SCROLLB-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-0.375, G.v2d->cur.ymax-0.375);
+ myortho2(G.v2d->cur.xmin-SCROLLB-0.375, G.v2d->cur.xmax-0.375, G.v2d->cur.ymin-SCROLLB-0.375, G.v2d->cur.ymax-0.375);
block= uiNewBlock(&sa->uiblocks, "outliner buttons", UI_EMBOSS, UI_HELV, sa->win);
outliner_buttons(block, soops, &soops->tree);
Index: source/blender/src/space.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.357
diff -u -r1.357 space.c
--- source/blender/src/space.c 12 Jun 2006 20:01:18 -0000 1.357
+++ source/blender/src/space.c 13 Jun 2006 11:37:52 -0000
@@ -4333,10 +4333,16 @@
outliner_show_hierarchy(sa);
break;
case PAGEUPKEY:
- outliner_page_up_down(sa, 1);
+ if(G.qual==LR_SHIFTKEY)
+ outliner_page_left_right(sa, 1);
+ else
+ outliner_page_up_down(sa, 1);
break;
case PAGEDOWNKEY:
- outliner_page_up_down(sa, -1);
+ if(G.qual==LR_SHIFTKEY)
+ outliner_page_left_right(sa, -1);
+ else
+ outliner_page_up_down(sa, -1);
break;
case RETKEY:
@@ -4353,6 +4359,21 @@
case PADMINUS:
outliner_one_level(sa, -1);
break;
+
+ case RIGHTARROWKEY:
+ printf("Outliner doing expand level. RightArrowKey \n"); //debug print
+ outliner_one_level(sa, 1);
+ break;
+ case LEFTARROWKEY:
+ printf("Outliner doing close level. LeftArrowKey \n"); // debug print
+ outliner_one_level(sa, -1);
+ break;
+ //case UPARROWKEY:
+ // somefunc that moves the current selection up
+ //break;
+ //case DOWNARROWKEY:
+ // somefunc that moves the current selection down
+ //break;
}
}
else {
@@ -4505,10 +4526,10 @@
v2d->minzoom= 1.0;
v2d->maxzoom= 1.0;
- v2d->scroll= L_SCROLL;
+ v2d->scroll= L_SCROLL+B_SCROLL; // Aligorith: trying to get scrollbars in outliner
v2d->keepaspect= 1;
v2d->keepzoom= 1;
- v2d->keeptot= 1;
+ v2d->keeptot= 0; // originally 1. setting this to 0 seems to set it free. Aligorith
}
else {
v2d->tot.xmin= -28.0;
@@ -4527,8 +4548,8 @@
v2d->minzoom= 0.01f;
v2d->maxzoom= 2.0;
- /* v2d->scroll= L_SCROLL+B_SCROLL; */
- v2d->scroll= 0;
+ /* v2d->scroll= L_SCROLL+B_SCROLL; */
+ v2d->scroll= 0;
v2d->keepaspect= 1;
v2d->keepzoom= 0;
v2d->keeptot= 0;
@@ -4679,7 +4700,7 @@
}
-/* ******************** SPACE: Time ********************** */
+/* ******************** SPACE: Nodes ********************** */
extern void drawnodespace(ScrArea *sa, void *spacedata);
extern void winqreadnodespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
Index: source/blender/src/transform_manipulator.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/transform_manipulator.c,v
retrieving revision 1.59
diff -u -r1.59 transform_manipulator.c
--- source/blender/src/transform_manipulator.c 12 Jun 2006 20:01:18 -0000 1.59
+++ source/blender/src/transform_manipulator.c 13 Jun 2006 09:08:44 -0000
@@ -69,6 +69,7 @@
#include "BLI_editVert.h"
#include "BIF_editarmature.h"
+#include "BIF_editmesh.h" /* Aligorith: added to satisfy compiler */
#include "BIF_gl.h"
#include "BIF_mywindow.h"
#include "BIF_resources.h"
Index: source/blender/src/usiblender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.117
diff -u -r1.117 usiblender.c
--- source/blender/src/usiblender.c 16 Jun 2006 04:32:39 -0000 1.117
+++ source/blender/src/usiblender.c 16 Jun 2006 06:59:41 -0000
@@ -94,6 +94,7 @@
#include "BIF_editmesh.h"
#include "BIF_editmode_undo.h"
#include "BIF_editsound.h"
+#include "BIF_language.h" /* Aligorith: added to satisfy compiler */
#include "BIF_poseobject.h"
#include "BIF_previewrender.h"
#include "BIF_renderwin.h"

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
0a/ab/66b689ade8c959fd7e4c9d72563e

Event Timeline