[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22971] branches/blender2.5/blender: 2.5/ Multires:
Nicholas Bishop
nicholasbishop at gmail.com
Thu Sep 3 19:45:58 CEST 2009
Revision: 22971
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22971
Author: nicholasbishop
Date: 2009-09-03 19:45:04 +0200 (Thu, 03 Sep 2009)
Log Message:
-----------
2.5/Multires:
* Added back multires delete higher levels (new operator + button)
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_modifier.py
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_modifier.c
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_modifier.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_modifier.py 2009-09-03 16:24:25 UTC (rev 22970)
+++ branches/blender2.5/blender/release/ui/buttons_data_modifier.py 2009-09-03 17:45:04 UTC (rev 22971)
@@ -269,7 +269,11 @@
def MULTIRES(self, layout, ob, md):
layout.itemR(md, "subdivision_type")
- layout.itemO("object.multires_subdivide", text="Subdivide")
+
+ row = layout.row()
+ row.itemO("object.multires_subdivide", text="Subdivide")
+ row.itemO("object.multires_higher_levels_delete", text="Delete Higher")
+
layout.itemR(md, "level")
def PARTICLE_INSTANCE(self, layout, ob, md):
Modified: branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h 2009-09-03 16:24:25 UTC (rev 22970)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h 2009-09-03 17:45:04 UTC (rev 22971)
@@ -109,6 +109,7 @@
void OBJECT_OT_modifier_convert(struct wmOperatorType *ot);
void OBJECT_OT_modifier_copy(struct wmOperatorType *ot);
void OBJECT_OT_multires_subdivide(struct wmOperatorType *ot);
+void OBJECT_OT_multires_higher_levels_delete(struct wmOperatorType *ot);
void OBJECT_OT_meshdeform_bind(struct wmOperatorType *ot);
void OBJECT_OT_hook_reset(struct wmOperatorType *ot);
void OBJECT_OT_hook_recenter(struct wmOperatorType *ot);
Modified: branches/blender2.5/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_modifier.c 2009-09-03 16:24:25 UTC (rev 22970)
+++ branches/blender2.5/blender/source/blender/editors/object/object_modifier.c 2009-09-03 17:45:04 UTC (rev 22971)
@@ -676,6 +676,34 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
+/************* multires delete higher levels operator ****************/
+
+static int multires_higher_levels_delete_exec(bContext *C, wmOperator *op)
+{
+ PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_MultiresModifier);
+ Object *ob= ptr.id.data;
+ MultiresModifierData *mmd= ptr.data;
+
+ if(mmd) {
+ multiresModifier_del_levels(mmd, ob, 1);
+ WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+ }
+
+ return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot)
+{
+ ot->name= "Delete Higher Levels";
+ ot->idname= "OBJECT_OT_multires_higher_levels_delete";
+ ot->poll= ED_operator_object_active;
+
+ ot->exec= multires_higher_levels_delete_exec;
+
+ /* flags */
+ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
/****************** multires subdivide operator *********************/
static int multires_subdivide_exec(bContext *C, wmOperator *op)
Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c 2009-09-03 16:24:25 UTC (rev 22970)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c 2009-09-03 17:45:04 UTC (rev 22971)
@@ -119,6 +119,7 @@
WM_operatortype_append(OBJECT_OT_modifier_convert);
WM_operatortype_append(OBJECT_OT_modifier_copy);
WM_operatortype_append(OBJECT_OT_multires_subdivide);
+ WM_operatortype_append(OBJECT_OT_multires_higher_levels_delete);
WM_operatortype_append(OBJECT_OT_meshdeform_bind);
WM_operatortype_append(OBJECT_OT_hook_reset);
WM_operatortype_append(OBJECT_OT_hook_recenter);
More information about the Bf-blender-cvs
mailing list