[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57881] branches/soc-2013-bge/source/ blender: Moving the material level of detail switch to avoid problems with the material panel .

[Daniel Stokes]

Revision: 57881
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57881
Author:   kupoman
Date:     2013-06-30 08:29:42 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
Moving the material level of detail switch to avoid problems with the material panel.

Modified Paths:
--------------
    branches/soc-2013-bge/source/blender/blenkernel/intern/material.c
    branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c

Modified: branches/soc-2013-bge/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/intern/material.c	2013-06-29 16:33:16 UTC (rev 57880)
+++ branches/soc-2013-bge/source/blender/blenkernel/intern/material.c	2013-06-30 08:29:42 UTC (rev 57881)
@@ -64,7 +64,6 @@
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
-#include "BKE_object.h"
 #include "BKE_curve.h"
 
 #include "GPU_material.h"
@@ -622,10 +621,6 @@
 {
 	Material ***matarar, *ma;
 	short *totcolp;
-	
-	if (ob && BKE_object_lod_check(ob, NULL)) {
-		ob = BKE_object_lod_matob_get(ob);
-	}
 
 	if (ob == NULL) return NULL;
 	

Modified: branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c	2013-06-29 16:33:16 UTC (rev 57880)
+++ branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c	2013-06-30 08:29:42 UTC (rev 57881)
@@ -1389,6 +1389,11 @@
 	int gamma = BKE_scene_check_color_management_enabled(scene);
 	int new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
 	int use_matcap = (v3d->flag2 & V3D_SHOW_SOLID_MATCAP); /* assumes v3d->defmaterial->preview is set */
+
+	if (BKE_object_lod_check(ob, scene)) {
+		Object *tmp = BKE_object_lod_matob_get(ob);
+		if (tmp) ob = tmp;
+	}
 	
 	/* initialize state */
 	memset(&GMS, 0, sizeof(GMS));