[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40839] trunk/blender/source/blender/ makesrna/intern/rna_particle.c: rna_ParticleDupliWeight_name_length was returning an incorrect value.

Campbell Barton ideasman42 at gmail.com
Fri Oct 7 01:16:13 CEST 2011


Revision: 40839
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40839
Author:   campbellbarton
Date:     2011-10-06 23:16:12 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
rna_ParticleDupliWeight_name_length was returning an incorrect value. Zealous debug checks are testing the (buf[len] == '\0')

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-10-06 22:04:01 UTC (rev 40838)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-10-06 23:16:12 UTC (rev 40839)
@@ -691,14 +691,13 @@
 	}
 }
 
+static void rna_ParticleDupliWeight_name_get(PointerRNA *ptr, char *str);
+
 static int rna_ParticleDupliWeight_name_length(PointerRNA *ptr)
 {
-	ParticleDupliWeight *dw= ptr->data;
-
-	if(dw->ob)
-		return strlen(dw->ob->id.name+2) + 7;
-	else
-		return 9 + 7;
+	char tstr[32];
+	rna_ParticleDupliWeight_name_get(ptr, tstr);
+	return strlen(tstr);
 }
 
 static void rna_ParticleDupliWeight_name_get(PointerRNA *ptr, char *str)




More information about the Bf-blender-cvs mailing list