[Bf-blender-cvs] [cf170445b85] custom-manipulators: Show only face-map now works in clay/eevee engines

Campbell Barton noreply at git.blender.org
Tue May 30 11:03:56 CEST 2017


Commit: cf170445b85bebbb7b0d3fb39875b8005fcca742
Author: Campbell Barton
Date:   Tue May 30 19:03:10 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBcf170445b85bebbb7b0d3fb39875b8005fcca742

Show only face-map now works in clay/eevee engines

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

M	source/blender/draw/intern/draw_armature.c

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

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 7e12ac7d3f8..865aaaf6bfa 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1021,6 +1021,13 @@ static void draw_points(
 	}
 }
 
+static bool pchan_is_draw_fmap_only(const bArmature *arm, const bPoseChannel *pchan)
+{
+	return ((arm->flag & ARM_POSEMODE) &&
+	        (pchan->fmap_data != NULL) &&
+	        (pchan->bone->flag & BONE_DRAW_FMAP_ONLY));
+}
+
 /** \} */
 
 
@@ -1312,7 +1319,9 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
 		arm->layer_used |= bone->layer;
 
 		/* bone must be visible */
-		if ((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0) {
+		if ((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) == 0 &&
+		    (!pchan_is_draw_fmap_only(arm, pchan)))
+		{
 			if (bone->layer & arm->layer) {
 				const int select_id = is_pose_select ? index : (unsigned int)-1;




More information about the Bf-blender-cvs mailing list