[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38188] trunk/blender/source/blender/ editors/interface/interface_templates.c: Fix part of #26811: absolute shape keys should not show influence value in list.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Jul 7 13:01:37 CEST 2011


Revision: 38188
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38188
Author:   blendix
Date:     2011-07-07 11:01:36 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Fix part of #26811: absolute shape keys should not show influence value in list.

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

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2011-07-07 10:54:11 UTC (rev 38187)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2011-07-07 11:01:36 UTC (rev 38188)
@@ -33,6 +33,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "DNA_key_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
 
@@ -2104,6 +2105,7 @@
 	}
 	else if(itemptr->type == &RNA_ShapeKey) {
 		Object *ob= (Object*)activeptr->data;
+		Key *key= (Key*)itemptr->data;
 
 		split= uiLayoutSplit(sub, 0.75f, 0);
 
@@ -2111,7 +2113,7 @@
 
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		row= uiLayoutRow(split, 1);
-		if(i == 0) uiItemL(row, "", ICON_NONE);
+		if(i == 0 || (key->type != KEY_RELATIVE)) uiItemL(row, "", ICON_NONE);
 		else uiItemR(row, itemptr, "value", 0, "", ICON_NONE);
 
 		if(ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH))




More information about the Bf-blender-cvs mailing list