svn merge -r41575:41602 ^/trunk/blender

5 files changed, 90 insertions, 24 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index b135aae30d5..2c4fdb61db5 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -48,6 +48,7 @@
 #include "DNA_vfont_types.h"
 
 #include "BLI_math.h"
+#include "BLI_string.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
 
@@ -1012,23 +1013,21 @@ static void copy_object_set_idnew(bContext *C, int dupflag)
 
 /********************* Make Duplicates Real ************************/
 
-static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base)
+static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
+                                       const short use_base_parent,
+                                       const short use_hierarchy)
 {
-	Base *basen;
-	Object *ob;
 	ListBase *lb;
 	DupliObject *dob;
-	
-	if(!base && !(base = BASACT))
-		return;
-	
+
 	if(!(base->object->transflag & OB_DUPLI))
 		return;
 	
 	lb= object_duplilist(scene, base->object);
 	
 	for(dob= lb->first; dob; dob= dob->next) {
-		ob= copy_object(dob->ob);
+		Base *basen;
+		Object *ob= copy_object(dob->ob);
 		/* font duplis can have a totcol without material, we get them from parent
 		* should be implemented better...
 		*/
@@ -1055,22 +1054,85 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base)
 		object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
 	}
 	
+	if (use_hierarchy) {
+		for(dob= lb->first; dob; dob= dob->next) {
+			/* original parents */
+			Object *ob_src=     dob->ob;
+			Object *ob_src_par= ob_src->parent;
+
+			Object *ob_dst=     (Object *)ob_src->id.newid;
+
+			if (ob_src_par && ob_src_par->id.newid) {
+				/* the parent was also made real, parent newly real duplis */
+				Object *ob_dst_par= (Object *)ob_src_par->id.newid;
+
+				/* allow for all possible parent types */
+				ob_dst->partype= ob_src->partype;
+				BLI_strncpy(ob_dst->parsubstr, ob_src->parsubstr, sizeof(ob_dst->parsubstr));
+				ob_dst->par1= ob_src->par1;
+				ob_dst->par2= ob_src->par2;
+				ob_dst->par3= ob_src->par3;
+
+				copy_m4_m4(ob_dst->parentinv, ob_src->parentinv);
+
+				ob_dst->parent= ob_dst_par;
+			}
+			else if (use_base_parent) {
+				ob_dst->parent= base->object;
+				ob_dst->partype= PAROBJECT;
+			}
+
+			if (ob_dst->parent) {
+				invert_m4_m4(ob_dst->parentinv, dob->mat);
+
+				/* note, this may be the parent of other objects, but it should
+				 * still work out ok */
+				object_apply_mat4(ob_dst, dob->mat, FALSE, TRUE);
+
+				/* to set ob_dst->orig and incase theres any other discrepicies */
+				DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
+			}
+		}
+	}
+	else if (use_base_parent) {
+		/* since we are ignoring the internal hierarchy - parent all to the
+		 * base object */
+		for(dob= lb->first; dob; dob= dob->next) {
+			/* original parents */
+			Object *ob_src=     dob->ob;
+			Object *ob_dst=     (Object *)ob_src->id.newid;
+
+			ob_dst->parent= base->object;
+			ob_dst->partype= PAROBJECT;
+
+			/* similer to the code above, see comments */
+			invert_m4_m4(ob_dst->parentinv, dob->mat);
+			object_apply_mat4(ob_dst, dob->mat, FALSE, TRUE);
+			DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
+
+
+		}
+	}
+
 	copy_object_set_idnew(C, 0);
 	
 	free_object_duplilist(lb);
 	
-	base->object->transflag &= ~OB_DUPLI;	
+	base->object->transflag &= ~OB_DUPLI;
 }
 
-static int object_duplicates_make_real_exec(bContext *C, wmOperator *UNUSED(op))
+static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain= CTX_data_main(C);
 	Scene *scene= CTX_data_scene(C);
+
+	const short use_base_parent= RNA_boolean_get(op->ptr, "use_base_parent");
+	const short use_hierarchy= RNA_boolean_get(op->ptr, "use_hierarchy");
 	
 	clear_id_newpoins();
 		
 	CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-		make_object_duplilist_real(C, scene, base);
+		make_object_duplilist_real(C, scene, base, use_base_parent, use_hierarchy);
 
 		/* dependencies were changed */
 		WM_event_add_notifier(C, NC_OBJECT|ND_PARENT, base->object);
@@ -1100,6 +1162,9 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "use_base_parent", 0, "Parent", "Parent newly created objects to the original duplicator");
+	RNA_def_boolean(ot->srna, "use_hierarchy", 0, "Keep Hierarchy", "Maintain parent child relationships");
 }
 
 /**************************** Convert **************************/
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 1c94ba1afbb..28b9d9ba817 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1131,19 +1131,19 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 				base->object->recalc |= OB_RECALC_OB;
 				
 				if(event==1) {  /* loc */
-					VECCOPY(base->object->loc, ob->loc);
-					VECCOPY(base->object->dloc, ob->dloc);
+					copy_v3_v3(base->object->loc, ob->loc);
+					copy_v3_v3(base->object->dloc, ob->dloc);
 				}
 				else if(event==2) {  /* rot */
-					VECCOPY(base->object->rot, ob->rot);
-					VECCOPY(base->object->drot, ob->drot);
+					copy_v3_v3(base->object->rot, ob->rot);
+					copy_v3_v3(base->object->drot, ob->drot);
 
-					QUATCOPY(base->object->quat, ob->quat);
-					QUATCOPY(base->object->dquat, ob->dquat);
+					copy_qt_qt(base->object->quat, ob->quat);
+					copy_qt_qt(base->object->dquat, ob->dquat);
 				}
 				else if(event==3) {  /* size */
-					VECCOPY(base->object->size, ob->size);
-					VECCOPY(base->object->dsize, ob->dsize);
+					copy_v3_v3(base->object->size, ob->size);
+					copy_v3_v3(base->object->dsize, ob->dsize);
 				}
 				else if(event==4) {  /* drawtype */
 					base->object->dt= ob->dt;
@@ -1332,7 +1332,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event)
 					base->object->index= ob->index;
 				}
 				else if(event==31) { /* object color */
-					QUATCOPY(base->object->col, ob->col);
+					copy_v4_v4(base->object->col, ob->col);
 				}
 			}
 		}
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index c1ba0b207cb..9f3bc9bbf37 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -35,6 +35,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_listbase.h"
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
@@ -132,7 +133,7 @@ void load_editLatt(Object *obedit)
 
 		bp= editlt->def;
 		while(tot--) {
-			VECCOPY(fp, bp->vec);
+			copy_v3_v3(fp, bp->vec);
 			fp+= 3;
 			bp++;
 		}
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 00faf86c866..d84d5ea6537 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -358,7 +358,7 @@ int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *
 		key= cache[a];
 		kmax= key->steps;
 		for(k=0; k<=kmax; k++,key++,cvert++,mvert++) {
-			VECCOPY(mvert->co,key->co);
+			copy_v3_v3(mvert->co,key->co);
 			if(k) {
 				medge->v1= cvert-1;
 				medge->v2= cvert;
@@ -377,7 +377,7 @@ int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *
 		key=cache[a];
 		kmax=key->steps;
 		for(k=0; k<=kmax; k++,key++,cvert++,mvert++) {
-			VECCOPY(mvert->co,key->co);
+			copy_v3_v3(mvert->co,key->co);
 			if(k) {
 				medge->v1=cvert-1;
 				medge->v2=cvert;
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index d60b7b31bf4..b4fee991bb2 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -134,7 +134,7 @@ static void object_clear_rot(Object *ob)
 			float eul[3], oldeul[3], quat1[4] = {0};
 			
 			if (ob->rotmode == ROT_MODE_QUAT) {
-				QUATCOPY(quat1, ob->quat);
+				copy_qt_qt(quat1, ob->quat);
 				quat_to_eul(oldeul, ob->quat);
 			}
 			else if (ob->rotmode == ROT_MODE_AXISANGLE) {