[Bf-blender-cvs] [e42e176] blender2.8: Merge branch 'master' into blender2.8

Julian Eisel noreply at git.blender.org
Thu Jan 5 00:36:20 CET 2017


Commit: e42e1769b36fddf9b0c161bcb2f7c7f2aeb613eb
Author: Julian Eisel
Date:   Thu Jan 5 00:31:15 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBe42e1769b36fddf9b0c161bcb2f7c7f2aeb613eb

Merge branch 'master' into blender2.8

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

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



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

diff --cc source/blender/editors/space_view3d/view3d_header.c
index ab0cae6,bf1bdf6..67e2586
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@@ -334,18 -334,16 +334,18 @@@ void uiTemplateHeader3D(uiLayout *layou
  		uiItemMenuEnumO(row, C, "OBJECT_OT_mode_set", "mode", name, icon);
  	}
  
 -	/* Draw type */
 -	uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 +	if (IS_VIEWPORT_LEGACY(v3d)) {
 +		/* Draw type */
 +		uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 +	}
  
- 	if (obedit == NULL && is_paint) {
- 		if (ob->mode & OB_MODE_ALL_PAINT) {
- 			/* Only for Weight Paint. makes no sense in other paint modes. */
- 			row = uiLayoutRow(layout, true);
- 			uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
- 		}
+ 	row = uiLayoutRow(layout, true);
+ 	uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+ 	if (!ob || ELEM(ob->mode, OB_MODE_OBJECT, OB_MODE_POSE, OB_MODE_WEIGHT_PAINT)) {
+ 		uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+ 	}
  
+ 	if (obedit == NULL && is_paint) {
  		/* Manipulators aren't used in paint modes */
  		if (!ELEM(ob->mode, OB_MODE_SCULPT, OB_MODE_PARTICLE_EDIT)) {
  			/* masks aren't used for sculpt and particle painting */




More information about the Bf-blender-cvs mailing list