2.5/Multires:

* Disabled multires subdivide button in editmode (again)

SVN weirdness:
I already did this in r22447. Somehow it got changed back -- but I can't find any log of it getting reverted, either in my email or on p.b.o. This is extremely weird!

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 3785e17f67cdaf527b86165599766daafe2eba36..1b20f90360a2adc92a01a968802f1d532b6784a1 100644 (file)
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -699,7 +699,8 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
 
 static int multires_subdivide_poll(bContext *C)
 {
 
 static int multires_subdivide_poll(bContext *C)
 {

-       return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL);
+       return (CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier).data != NULL) &&
+               CTX_data_edit_object(C) == NULL;

 }
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)
 }
 
 void OBJECT_OT_multires_subdivide(wmOperatorType *ot)