[Bf-blender-cvs] [8eeb857cab8] greasepencil-object: Fix merge error in Topbar
Antonio Vazquez
noreply at git.blender.org
Sun Jun 17 19:44:04 CEST 2018
Commit: 8eeb857cab8e67a0e9ac900d5e66254d638db9a7
Author: Antonio Vazquez
Date: Sun Jun 17 19:43:36 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8eeb857cab8e67a0e9ac900d5e66254d638db9a7
Fix merge error in Topbar
This errors broke the topbar
===================================================================
M release/scripts/startup/bl_ui/space_topbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 675e97add17..a88e8164436 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -91,9 +91,6 @@ class TOPBAR_HT_lower_bar(Header):
def draw_left(self, context):
layout = self.layout
-
- def draw_center(self, context):
- layout = self.layout
mode = context.mode
# Active Tool
More information about the Bf-blender-cvs
mailing list