[Bf-blender-cvs] [792f0aaad54] HMD_viewport: Merge branch 'master' into HMD_viewport

Julian Eisel noreply at git.blender.org
Tue Apr 18 13:27:39 CEST 2017


Commit: 792f0aaad54631712de02df6b301e58ae3b59575
Author: Julian Eisel
Date:   Tue Apr 18 13:18:49 2017 +0200
Branches: HMD_viewport
https://developer.blender.org/rB792f0aaad54631712de02df6b301e58ae3b59575

Merge branch 'master' into HMD_viewport

Conflicts:
	source/blender/editors/gpencil/gpencil_paint.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 4f1ff1eb013,d6e40377e63..3897fe8630b
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -637,8 -637,7 +638,8 @@@ static short gp_stroke_addpoint(tGPsdat
  				View3D *v3d = p->sa->spacedata.first;
  				
  				view3d_region_operator_needs_opengl(p->win, p->ar);
 -				ED_view3d_autodist_init(p->scene, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
 +				ED_view3d_autodist_init(p->scene, p->wm, p->win, p->ar, v3d,
- 				                        (p->gpd->flag & GP_DATA_DEPTH_STROKE) ? 1 : 0);
++				                        (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
  			}
  			
  			/* convert screen-coordinates to appropriate coordinates (and store them) */
@@@ -1805,8 -1804,7 +1807,8 @@@ static void gp_paint_strokeend(tGPsdat
  		
  		/* need to restore the original projection settings before packing up */
  		view3d_region_operator_needs_opengl(p->win, p->ar);
 -		ED_view3d_autodist_init(p->scene, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
 +		ED_view3d_autodist_init(p->scene, p->wm, p->win, p->ar, v3d,
- 		                        (p->gpd->flag & GP_DATA_DEPTH_STROKE) ? 1 : 0);
++		                        (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
  	}
  	
  	/* check if doing eraser or not */




More information about the Bf-blender-cvs mailing list