fix for [#9651] raw_export.py tooltip outdated?

own error, bpath looper was trying to free NULL pointer,
added fromOrig to python mtex api
made FromOrig and FromDupli tooltips be understandable 

4 files changed, 12 insertions, 6 deletions

diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index d92414cc46b..66eb63c8dfd 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -239,8 +239,10 @@ static struct Sequence *seq_stepdata__internal(struct BPathIterator *bpi, int st
 				return seq;
 			} else {
 				/* keep looking through the next scene, reallocate seq array */
-				MEM_freeN((void *)bpi->seqdata.seqar);
-				bpi->seqdata.seqar = NULL;
+				if (bpi->seqdata.seqar) {
+					MEM_freeN((void *)bpi->seqdata.seqar);
+					bpi->seqdata.seqar = NULL;
+				}
 				bpi->seqdata.scene = bpi->seqdata.scene->id.next;
 			}
 		} else {
diff --git a/source/blender/python/api2_2x/MTex.c b/source/blender/python/api2_2x/MTex.c
index f5d93935fd3..b9a8f7fff65 100644
--- a/source/blender/python/api2_2x/MTex.c
+++ b/source/blender/python/api2_2x/MTex.c
@@ -143,8 +143,11 @@ static PyGetSetDef MTex_getseters[] = {
 		"Correct normal mapping for Texture space and Object space",
 		(void*) MTEX_VIEWSPACE },
 	{ "fromDupli", (getter) MTex_getFlag, (setter) MTex_setFlag,
-		"If object is duplicated by vertices, faces or particles, inherit texture coordinate from parent object",
+		"Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent",
 		(void*) MTEX_DUPLI_MAPTO },
+	{ "fromOrig", (getter) MTex_getFlag, (setter) MTex_setFlag,
+		"Dupli's derive their object coordinates from the original objects transformation",
+		(void*) MTEX_OB_DUPLI_ORIG },
 	{ "xproj", (getter) MTex_getProjX, (setter) MTex_setProjX,
 		"Projection of X axis to Texture space", NULL },
 	{ "yproj", (getter) MTex_getProjY, (setter) MTex_setProjY,
diff --git a/source/blender/python/api2_2x/doc/Texture.py b/source/blender/python/api2_2x/doc/Texture.py
index 8b29d91ca19..5161ac5ea56 100644
--- a/source/blender/python/api2_2x/doc/Texture.py
+++ b/source/blender/python/api2_2x/doc/Texture.py
@@ -515,7 +515,8 @@ class MTex:
 	@ivar neg: Negate texture values mode
 	@ivar noRGB: Convert texture RGB values to intensity values
 	@ivar correctNor: Correct normal mapping for Texture space and Object space
-	@ivar fromDupli: If object is duplicated by vertices, faces or particles, inherit texture coordinate from parent object
+	@ivar fromDupli: Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent
+	@ivar fromOrig: Dupli's derive their object coordinates from the original objects transformation
 	@ivar xproj: Projection of X axis to Texture space. L{Proj}
 	@ivar yproj: Projection of Y axis to Texture space. L{Proj}
 	@ivar zproj: Projection of Z axis to Texture space. L{Proj}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 4500fc4a08c..5e420ade204 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -3440,9 +3440,9 @@ static void material_panel_map_input(Object *ob, Material *ma)
 	uiBlockEndAlign(block);
 
 	if(ELEM(mtex->texco, TEXCO_UV, TEXCO_ORCO))
-		uiDefButBitS(block, TOG, MTEX_DUPLI_MAPTO, B_MATPRV, "From Dupli",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "If object is duplicated by vertices, faces or particles, inherit texture coordinate from parent object");
+		uiDefButBitS(block, TOG, MTEX_DUPLI_MAPTO, B_MATPRV, "From Dupli",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent");
 	else if(mtex->texco == TEXCO_OBJECT)
-		uiDefButBitS(block, TOG, MTEX_OB_DUPLI_ORIG, B_MATPRV, "From Original",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "If object is duplicated, use object coordinates as if the object was in its original position");
+		uiDefButBitS(block, TOG, MTEX_OB_DUPLI_ORIG, B_MATPRV, "From Original",	820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "Dupli's derive their object coordinates from the original objects transformation");
 
 
 	/* COORDS */