[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51081] trunk/blender/source/blender/ makesrna/intern/rna_object_api.c: Fix #32734: Object.to_mesh() gave wrong user count for curves/surface/text objects.

[Brecht Van Lommel]

Revision: 51081
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51081
Author:   blendix
Date:     2012-10-05 12:18:09 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Fix #32734: Object.to_mesh() gave wrong user count for curves/surface/text objects.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2012-10-05 12:18:07 UTC (rev 51080)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2012-10-05 12:18:09 UTC (rev 51081)
@@ -177,6 +177,8 @@
 				return NULL;  /* only do basis metaball */
 			
 			tmpmesh = BKE_mesh_add("Mesh");
+			/* BKE_mesh_add gives us a user count we don't need */
+			tmpmesh->id.us--;
 
 			if (render) {
 				ListBase disp = {NULL, NULL};
@@ -186,6 +188,7 @@
 			}
 			else
 				BKE_mesh_from_metaball(&ob->disp, tmpmesh);
+
 			break;
 
 		}
@@ -214,6 +217,9 @@
 				dm->release(dm);
 			}
 
+			/* BKE_mesh_add/copy gives us a user count we don't need */
+			tmpmesh->id.us--;
+
 			break;
 		default:
 			BKE_report(reports, RPT_ERROR, "Object does not have geometry data");
@@ -283,9 +289,6 @@
 	/* cycles and exporters rely on this still */
 	BKE_mesh_tessface_ensure(tmpmesh);
 
-	/* we don't assign it to anything */
-	tmpmesh->id.us--;
-	
 	/* make sure materials get updated in objects */
 	test_object_materials(&tmpmesh->id);