[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22690] branches/blender2.5/blender/source /blender/editors/object/object_modifier.c: 2.5/Multires:

Nicholas Bishop nicholasbishop at gmail.com
Sat Aug 22 03:01:53 CEST 2009


Revision: 22690
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22690
Author:   nicholasbishop
Date:     2009-08-22 03:01:53 +0200 (Sat, 22 Aug 2009)

Log Message:
-----------
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!

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_modifier.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_modifier.c	2009-08-22 00:19:24 UTC (rev 22689)
+++ branches/blender2.5/blender/source/blender/editors/object/object_modifier.c	2009-08-22 01:01:53 UTC (rev 22690)
@@ -699,7 +699,8 @@
 
 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)





More information about the Bf-blender-cvs mailing list