[Bf-blender-cvs] [d0da158] gooseberry: Merge branch 'master' into gooseberry

[Lukas Tönne]

Commit: d0da158ad54b04213237091183e94d403199f34e
Author: Lukas Tönne
Date:   Tue Feb 17 15:24:23 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBd0da158ad54b04213237091183e94d403199f34e

Merge branch 'master' into gooseberry

Conflicts:
	intern/cycles/blender/blender_mesh.cpp
	source/blender/editors/space_view3d/view3d_draw.c

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_mesh.cpp
index 7f3752d,572d8e8..c8b0858
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@@ -568,8 -525,6 +571,7 @@@ static void create_mesh(Scene *scene, M
  	 */
  	attr_create_vertex_color(scene, mesh, b_mesh, nverts);
  	attr_create_uv_map(scene, mesh, b_mesh, nverts);
- 	attr_create_pointiness(scene, mesh, b_mesh);
 +	attr_create_vertex_properties(scene, mesh, b_mesh);
  
  	/* for volume objects, create a matrix to transform from object space to
  	 * mesh texture space. this does not work with deformations but that can
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index c8f7399,f552d5c..c08ded5
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -2704,9 -2671,10 +2703,11 @@@ static void view3d_draw_objects
  	RegionView3D *rv3d = ar->regiondata;
  	Base *base;
  	const bool do_camera_frame = !draw_offscreen;
 +	const bool is_wire_color = V3D_IS_WIRECOLOR(scene, v3d);
- 	const bool draw_floor = (rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO);
  	const bool draw_grids = !draw_offscreen && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0;
+ 	const bool draw_floor = (rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO);
+ 	/* only draw grids after in solid modes, else it hovers over mesh wires */
+ 	const bool draw_grids_after = draw_grids && draw_floor && (v3d->drawtype > OB_WIRE);
  	bool xrayclear = true;
  
  	if (!draw_offscreen) {