[Bf-blender-cvs] [aac3c0b] temp_manipulators_core: Fix selected manipulators only drawn while hovering

Julian Eisel noreply at git.blender.org
Tue Oct 4 15:48:06 CEST 2016


Commit: aac3c0b6c8552ed45db48f5fd8f9285a6a020514
Author: Julian Eisel
Date:   Tue Oct 4 15:23:08 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rBaac3c0b6c8552ed45db48f5fd8f9285a6a020514

Fix selected manipulators only drawn while hovering

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator.c

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 7ce42f1..8f39659 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -446,7 +446,8 @@ bool wm_manipulator_is_visible(wmManipulator *manipulator)
 		return false;
 	}
 	if ((manipulator->flag & WM_MANIPULATOR_DRAW_HOVER) &&
-	    !(manipulator->state & WM_MANIPULATOR_HIGHLIGHT))
+	    !(manipulator->state & WM_MANIPULATOR_HIGHLIGHT) &&
+	    !(manipulator->state & WM_MANIPULATOR_SELECTED)) /* still draw selected manipulators */
 	{
 		/* only draw on mouse hover */
 		return false;




More information about the Bf-blender-cvs mailing list