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

[Michael Fox]

Revision: 18521
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18521
Author:   mfoxdogg
Date:     2009-01-15 11:02:45 +0100 (Thu, 15 Jan 2009)

Log Message:
-----------
 2.5
*****

small commit, ported make dupli real

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c
    branches/blender2.5/blender/source/blender/editors/object/object_intern.h
    branches/blender2.5/blender/source/blender/editors/object/object_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-01-15 05:51:00 UTC (rev 18520)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-01-15 10:02:45 UTC (rev 18521)
@@ -2293,6 +2293,44 @@
 	prop = RNA_def_property(ot->srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_make_track_types);
 }
+
+/* ************* Make Dupli Real ********* */
+
+static int object_make_dupli_real_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	ScrArea *sa= CTX_wm_area(C);
+	View3D *v3d= sa->spacedata.first;
+	
+	clear_id_newpoins();
+		
+	CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+		make_object_duplilist_real(scene, v3d, base);
+	}
+	CTX_DATA_END;
+
+	DAG_scene_sort(CTX_data_scene(C));
+	ED_anim_dag_flush_update(C);	
+	WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
+	
+	ED_undo_push(C,"Make duplicates real");	
+	
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_make_dupli_real(wmOperatorType *ot)
+{
+	
+	/* identifiers */
+	ot->name= "Make Dupli Real";
+	ot->idname= "OBJECT_OT_make_dupli_real";
+	
+	/* api callbacks */
+	ot->invoke= WM_operator_confirm;
+	ot->exec= object_make_dupli_real_exec;
+	
+	ot->poll= ED_operator_scene_editable;
+}
 /* ******************* Set Object Center ********************** */
 
 static EnumPropertyItem prop_set_center_types[] = {

Modified: branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h	2009-01-15 05:51:00 UTC (rev 18520)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h	2009-01-15 10:02:45 UTC (rev 18521)
@@ -62,6 +62,7 @@
 void OBJECT_OT_set_slowparent(struct wmOperatorType *ot);
 void OBJECT_OT_clear_slowparent(struct wmOperatorType *ot);
 void OBJECT_OT_set_center(struct wmOperatorType *ot);
+void OBJECT_OT_make_dupli_real(struct wmOperatorType *ot);
 
 
 /* editlattice.c */

Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c	2009-01-15 05:51:00 UTC (rev 18520)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c	2009-01-15 10:02:45 UTC (rev 18521)
@@ -83,6 +83,7 @@
 	WM_operatortype_append(OBJECT_OT_set_slowparent);
 	WM_operatortype_append(OBJECT_OT_clear_slowparent);
 	WM_operatortype_append(OBJECT_OT_set_center);
+	WM_operatortype_append(OBJECT_OT_make_dupli_real);
 }
 
 void ED_keymap_object(wmWindowManager *wm)