[Bf-blender-cvs] [86b9311926a] blender2.8: Cleanup: quiet warning, whitespace

Campbell Barton noreply at git.blender.org
Tue May 8 10:58:17 CEST 2018


Commit: 86b9311926a580143da7cf69581942b6920dfd1a
Author: Campbell Barton
Date:   Tue May 8 10:57:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB86b9311926a580143da7cf69581942b6920dfd1a

Cleanup: quiet warning, whitespace

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

M	source/blender/draw/modes/shaders/armature_axes_vert.glsl
M	source/blender/windowmanager/intern/wm_toolsystem.c
M	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c

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

diff --git a/source/blender/draw/modes/shaders/armature_axes_vert.glsl b/source/blender/draw/modes/shaders/armature_axes_vert.glsl
index fe6edba1316..e46dab458e0 100644
--- a/source/blender/draw/modes/shaders/armature_axes_vert.glsl
+++ b/source/blender/draw/modes/shaders/armature_axes_vert.glsl
@@ -22,7 +22,7 @@ void main()
 	vec3 spos = screenVecs[0].xyz * screenPos.x + screenVecs[1].xyz * screenPos.y;
 	/* Scale uniformly by axis length */
 	spos *= length(chosen_axis);
-	
+
 	gl_Position = ViewProjectionMatrix * vec4(wpos + spos, 1.0);
 
 	finalColor.rgb = mix(colorAxis, color.rgb, color.a);
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 04542717b24..c351d0fd849 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -167,7 +167,7 @@ bool WM_toolsystem_active_tool_is_brush(const bContext *C)
 
 /* Follow wmMsgNotifyFn spec */
 void WM_toolsystem_do_msg_notify_tag_refresh(
-        bContext *C, wmMsgSubscribeKey *UNUSED(msg_key), wmMsgSubscribeValue *msg_val)
+        bContext *C, wmMsgSubscribeKey *UNUSED(msg_key), wmMsgSubscribeValue *UNUSED(msg_val))
 {
 	WorkSpace *workspace = CTX_wm_workspace(C);
 	WM_toolsystem_refresh(C, workspace);
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 3d7403dc0e1..f9b55865bf0 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -372,7 +372,7 @@ static bool manipulator_tweak_start_and_finish(
 			WM_operator_free_all_after(wm, op);
 			ED_undo_pop_op(C, op);
 		}
-		
+
 		/* XXX temporary workaround for modal manipulator operator
 		 * conflicting with modal operator attached to manipulator */
 		if (mpop->type->modal) {



More information about the Bf-blender-cvs mailing list