Fix for warning introduced in passes commit, also removed some more

radiosity code.

4 files changed, 6 insertions, 18 deletions

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index 1142bd96dcd..da2cf2f95c3 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -443,7 +443,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb)
 
 /* Prototype, see functions below */
 static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, 
-										 TreeElement *parent, short type, short index);
+										 TreeElement *parent, short type, int index);
 
 
 static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl)
@@ -564,7 +564,7 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s
 }
 
 static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, 
-										 TreeElement *parent, short type, short index)
+										 TreeElement *parent, short type, int index)
 {
 	TreeElement *te;
 	TreeStoreElem *tselem;
@@ -1234,7 +1234,7 @@ int need_add_seq_dup(Sequence *seq)
 	return(1);
 }
 
-void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, short index)
+void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, int index)
 {
 	TreeElement *ch;
 	Sequence *p;
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index c3a0165f945..b29d693a09b 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -45,7 +45,8 @@ typedef struct TreeElement {
 	ListBase subtree;
 	float xs, ys;		// do selection
 	int store_index;	// offset in tree store
-	short flag, index;	// flag for non-saved stuff, index for data arrays
+	short flag;			// flag for non-saved stuff
+	int index;			// index for data arrays
 	short idcode;		// from TreeStore id
 	short xend;			// width of item display, for select
 	char *name;
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 6e098186748..c75e825a0e7 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4674,8 +4674,7 @@ static int allow_render_dupli_instance(Render *re, DupliObject *dob, Object *obd
 
 	/* don't allow lamp, animated duplis, or radio render */
 	return (render_object_type(obd->type) &&
-	        (!(dob->type == OB_DUPLIGROUP) || !dob->animated) &&
-	        !(re->r.mode & R_RADIO));
+	        (!(dob->type == OB_DUPLIGROUP) || !dob->animated));
 }
 
 static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, int level, int enable)
@@ -5027,11 +5026,6 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
 		/* yafray: 'direct' radiosity, environment maps and raytree init not needed for yafray render */
 		/* although radio mode could be useful at some point, later */
 		if (re->r.renderer==R_INTERN) {
-#if 0		/* RADIO was removed */
-			/* RADIO (uses no R anymore) */
-			if(!re->test_break(re->tbh))
-				if(re->r.mode & R_RADIO) do_radio_render(re);
-#endif
 			/* raytree */
 			if(!re->test_break(re->tbh)) {
 				if(re->r.mode & R_RAYTRACE) {
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 7ba6a889ffc..43dab16d3fb 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -1773,13 +1773,6 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
 		shr->combined[0]+= shi->ambr;
 		shr->combined[1]+= shi->ambg;
 		shr->combined[2]+= shi->ambb;
-
-		/* removed
-		if(shi->combinedflag & SCE_PASS_RADIO) {
-			shr->combined[0]+= shi->r*shi->amb*shi->rad[0];
-			shr->combined[1]+= shi->g*shi->amb*shi->rad[1];
-			shr->combined[2]+= shi->b*shi->amb*shi->rad[2];
-		}*/
 		
 		if(ma->mode & MA_RAMP_COL) ramp_diffuse_result(shr->combined, shi);
 	}