Merge pull request #546 from SamuelCho/fred_outline_fix

Fixes ships in FRED only rendering wireframe instead of both wireframe and model when selected.

Author: The-E

code/fred2/fredrender.cpp

@@ -885,12 +885,8 @@ void render_one_model_htl(object *objp)
 	// build flags
 	if ((Show_ship_models || Show_outlines) && ((objp->type == OBJ_SHIP) || (objp->type == OBJ_START))){
 		g3_start_instance_matrix(&Eye_position, &Eye_matrix, 0);
-				
-		if (Show_ship_models){
-			j = MR_NORMAL;
-		} else {
-			j = MR_NO_POLYS;
-		}
+		
+		j = MR_NORMAL;
 
 		if(Show_dock_points){
 			debug_flags |= MR_DEBUG_BAY_PATHS;	
@@ -915,17 +911,21 @@ void render_one_model_htl(object *objp)
 
 		model_render_params render_info;
 
+		render_info.set_debug_flags(debug_flags);
+		render_info.set_replacement_textures(Ships[z].ship_replacement_textures);
+
 		if (Fred_outline)	{
 			render_info.set_color(Fred_outline >> 16, (Fred_outline >> 8) & 0xff, Fred_outline & 0xff);
-			j |= MR_SHOW_OUTLINE_HTL | MR_NO_LIGHTING | MR_NO_POLYS | MR_NO_TEXTURING;
+			render_info.set_flags(j | MR_SHOW_OUTLINE_HTL | MR_NO_LIGHTING | MR_NO_POLYS | MR_NO_TEXTURING);
+			model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, &objp->orient, &objp->pos);
 		}
 
-		render_info.set_flags(j);
-		render_info.set_debug_flags(debug_flags);
-		render_info.set_replacement_textures(Ships[z].ship_replacement_textures);
-
 		g3_done_instance(0);
-	  	model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, &objp->orient, &objp->pos);
+
+		if ( Show_ship_models ) {
+			render_info.set_flags(j);
+			model_render_immediate(&render_info, Ship_info[Ships[z].ship_info_index].model_num, &objp->orient, &objp->pos);
+		}
 	} else {
 		int r = 0, g = 0, b = 0;