[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58083] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #36063: cycles 3D viewport was incorrectly influenced by blender internal

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Jul 9 00:41:12 CEST 2013


Revision: 58083
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58083
Author:   blendix
Date:     2013-07-08 22:41:12 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix #36063: cycles 3D viewport was incorrectly influenced by blender internal
material halo settings.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-07-08 22:26:10 UTC (rev 58082)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-07-08 22:41:12 UTC (rev 58083)
@@ -3273,7 +3273,7 @@
 	Object *ob = base->object;
 	Mesh *me = ob->data;
 	Material *ma = give_current_material(ob, 1);
-	const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO));
+	const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO) && !BKE_scene_use_new_shading_nodes(scene));
 	eWireDrawMode draw_wire = OBDRAW_WIRE_OFF;
 	int /* totvert,*/ totedge, totface;
 	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);




More information about the Bf-blender-cvs mailing list