[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27444] trunk/blender/source/blender/ editors/space_outliner: Revert part of my last commit and leave emit/ environment out of outliner,

Brecht Van Lommel brecht at blender.org
Fri Mar 12 14:45:25 CET 2010


Revision: 27444
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27444
Author:   blendix
Date:     2010-03-12 14:45:25 +0100 (Fri, 12 Mar 2010)

Log Message:
-----------
Revert part of my last commit and leave emit/environment out of outliner,
there's a problem here with overflowing shorts that I'll need to fix later.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner.c
    trunk/blender/source/blender/editors/space_outliner/outliner_intern.h

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-03-12 13:19:32 UTC (rev 27443)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-03-12 13:45:25 UTC (rev 27444)
@@ -443,7 +443,7 @@
 
 /* Prototype, see functions below */
 static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, 
-										 TreeElement *parent, short type, int index);
+										 TreeElement *parent, short type, short index);
 
 
 static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl)
@@ -515,13 +515,15 @@
 	te->name= "Indirect";
 	te->directdata= &srl->passflag;
 
+	/* TODO SCE_PASS_ENVIRONMENT/EMIT overflow short..
+
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_ENVIRONMENT);
 	te->name= "Environment";
 	te->directdata= &srl->passflag;
 
 	te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_EMIT);
 	te->name= "Emit";
-	te->directdata= &srl->passflag;
+	te->directdata= &srl->passflag;*/
 }
 
 
@@ -564,7 +566,7 @@
 }
 
 static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, 
-										 TreeElement *parent, short type, int index)
+										 TreeElement *parent, short type, short index)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
@@ -1234,7 +1236,7 @@
 	return(1);
 }
 
-void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, int index)
+void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, short index)
 {
 	TreeElement *ch;
 	Sequence *p;

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_intern.h	2010-03-12 13:19:32 UTC (rev 27443)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_intern.h	2010-03-12 13:45:25 UTC (rev 27444)
@@ -46,7 +46,7 @@
 	float xs, ys;		// do selection
 	int store_index;	// offset in tree store
 	short flag;			// flag for non-saved stuff
-	int index;			// index for data arrays
+	short index;		// index for data arrays
 	short idcode;		// from TreeStore id
 	short xend;			// width of item display, for select
 	char *name;





More information about the Bf-blender-cvs mailing list