[Bf-blender-cvs] [4769b44] master: Fix T39745: "Origin to geometry" not working with Text objects. (regression)

[Campbell Barton]

Commit: 4769b44bdda7999bb69de9602f10dced3de2affe
Author: Campbell Barton
Date:   Wed Apr 16 13:18:42 2014 +1000
https://developer.blender.org/rB4769b44bdda7999bb69de9602f10dced3de2affe

Fix T39745: "Origin to geometry" not working with Text objects. (regression)

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

M	source/blender/editors/object/object_transform.c

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

diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 3493f6b..2dd5674 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -881,7 +881,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
 				Curve *cu = ob->data;
 
-				if (cu->bb == NULL && (centermode != ORIGIN_TO_CURSOR)) {
+				if (ob->bb == NULL && (centermode != ORIGIN_TO_CURSOR)) {
 					/* do nothing*/
 				}
 				else {
@@ -889,8 +889,9 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 						/* done */
 					}
 					else {
-						cent[0] = 0.5f * (cu->bb->vec[4][0] + cu->bb->vec[0][0]);
-						cent[1] = 0.5f * (cu->bb->vec[0][1] + cu->bb->vec[2][1]) - 0.5f;    /* extra 0.5 is the height o above line */
+						/* extra 0.5 is the height o above line */
+						cent[0] = 0.5f * (ob->bb->vec[4][0] + ob->bb->vec[0][0]);
+						cent[1] = 0.5f * (ob->bb->vec[0][1] + ob->bb->vec[2][1]);
 					}
 
 					cent[2] = 0.0f;