[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58123] trunk/blender/source/blender/ makesrna/intern/rna_object.c: fix [#36004] Vertex parent on curve point results in blank 'parent_type' on child object

Campbell Barton ideasman42 at gmail.com
Tue Jul 9 15:50:22 CEST 2013


Revision: 58123
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58123
Author:   campbellbarton
Date:     2013-07-09 13:50:22 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
fix [#36004] Vertex parent on curve point results in blank 'parent_type' on child object

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2013-07-09 13:47:19 UTC (rev 58122)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2013-07-09 13:50:22 UTC (rev 58123)
@@ -460,17 +460,20 @@
 	if (ob->parent) {
 		Object *par = ob->parent;
 		
-		if (par->type == OB_CURVE)
+		if (par->type == OB_CURVE) {
 			RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARCURVE);
-		else if (par->type == OB_LATTICE)
+		}
+		else if (par->type == OB_LATTICE) {
 			/* special hack: prevents this overriding others */
 			RNA_enum_items_add_value(&item, &totitem, &parent_type_items[4], PARSKEL);
+		}
 		else if (par->type == OB_ARMATURE) {
 			/* special hack: prevents this being overrided */
 			RNA_enum_items_add_value(&item, &totitem, &parent_type_items[3], PARSKEL);
 			RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARBONE);
 		}
-		else if (par->type == OB_MESH) {
+
+		if (ELEM4(par->type, OB_MESH, OB_CURVE, OB_SURF, OB_LATTICE)) {
 			RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARVERT1);
 			RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARVERT3);
 		}




More information about the Bf-blender-cvs mailing list