[Bf-blender-cvs] [9a98fad] master: Fix assert's, remove uiEndBlock calls

Campbell Barton noreply at git.blender.org
Mon Oct 27 15:40:20 CET 2014


Commit: 9a98fad2e02af95774ae9ed83ad60c8b41c2a03c
Author: Campbell Barton
Date:   Mon Oct 27 15:37:09 2014 +0100
Branches: master
https://developer.blender.org/rB9a98fad2e02af95774ae9ed83ad60c8b41c2a03c

Fix assert's, remove uiEndBlock calls

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

M	source/blender/editors/interface/interface_templates.c

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

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index b0bea42..6e67fec 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1900,7 +1900,6 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *ar, void *cumap_v)
 
 	uiBlockSetDirection(block, UI_RIGHT);
 
-	uiEndBlock(C, block);
 	return block;
 }
 
@@ -1975,7 +1974,6 @@ static uiBlock *curvemap_tools_posslope_func(bContext *C, ARegion *ar, void *cum
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 50);
 
-	uiEndBlock(C, block);
 	return block;
 }
 
@@ -2003,7 +2001,6 @@ static uiBlock *curvemap_tools_negslope_func(bContext *C, ARegion *ar, void *cum
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 50);
 
-	uiEndBlock(C, block);
 	return block;
 }
 
@@ -2027,7 +2024,6 @@ static uiBlock *curvemap_brush_tools_func(bContext *C, ARegion *ar, void *cumap_
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 50);
 
-	uiEndBlock(C, block);
 	return block;
 }




More information about the Bf-blender-cvs mailing list