[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33589] trunk/blender/source/blender/ editors/interface/interface.c: fix for error in recent commit, wasn' t masking out the non unit subtype flags.

[Campbell Barton]

Revision: 33589
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33589
Author:   campbellbarton
Date:     2010-12-10 14:15:11 +0100 (Fri, 10 Dec 2010)

Log Message:
-----------
fix for error in recent commit, wasn't masking out the non unit subtype flags.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface.c

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2010-12-10 10:34:12 UTC (rev 33588)
+++ trunk/blender/source/blender/editors/interface/interface.c	2010-12-10 13:15:11 UTC (rev 33589)
@@ -1261,8 +1261,9 @@
 		return 0;
 
 	if (scene->unit.system == USER_UNIT_NONE) {
-	   if (unit_type != PROP_UNIT_ROTATION)
+		if (unit_type != PROP_UNIT_ROTATION) {
 			return 0;
+		}
 	}
 
 	return 1;
@@ -3181,7 +3182,7 @@
 int uiButGetUnitType(uiBut *but)
 {
 	if(but->rnaprop) {
-		return RNA_property_subtype(but->rnaprop);
+		return RNA_SUBTYPE_UNIT(RNA_property_subtype(but->rnaprop));
 	}
 	else {
 		return ((int)but->unit_type)<<16;