[Bf-blender-cvs] [69fb332] master: Fix regression that Blender crashes on startup if UI translation is enabled, it was mistake in rB50b2c78ad8b6.

IRIE Shinsuke noreply at git.blender.org
Tue Feb 18 11:13:29 CET 2014


Commit: 69fb332709690a8c102e4fc282fe4ee5134f6dea
Author: IRIE Shinsuke
Date:   Tue Feb 18 19:09:44 2014 +0900
https://developer.blender.org/rB69fb332709690a8c102e4fc282fe4ee5134f6dea

Fix regression that Blender crashes on startup if UI translation is enabled, it was mistake in rB50b2c78ad8b6.

===================================================================

M	source/blender/makesrna/intern/rna_access.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7ba0cab..0ea55a0 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1283,8 +1283,8 @@ void RNA_property_enum_items_gettexted(bContext *C, PointerRNA *ptr, PropertyRNA
 				}
 			}
 
-			nitem = MEM_mallocN(sizeof(EnumPropertyItem) * tot + 1, "enum_items_gettexted");
-			memcpy(nitem, item, sizeof(EnumPropertyItem) * tot + 1);
+			nitem = MEM_mallocN(sizeof(EnumPropertyItem) * (tot + 1), "enum_items_gettexted");
+			memcpy(nitem, item, sizeof(EnumPropertyItem) * (tot + 1));
 
 			*r_free = true;
 		}




More information about the Bf-blender-cvs mailing list