[ #6442 ] image.repack (Python)

- Modified pack so it can repack too, rather the n raising an error.

editobject - Dont need to recalc data when hiding and unhiding. rather do what layers do and re-sort the scene.

1 files changed, 17 insertions, 12 deletions

diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c
index 06a9c8db1de..60ac0f6c5c9 100644
--- a/source/blender/python/api2_2x/Image.c
+++ b/source/blender/python/api2_2x/Image.c
@@ -542,6 +542,7 @@ static PyObject *Image_setPixelF( BPy_Image * self, PyObject * args )
 	pixel[index + 2] = ( char ) ( p[2] * 255.0 );
 	pixel[index + 3] = ( char ) ( p[3] * 255.0 );
 
+	ibuf->userflags |= IB_BITMAPDIRTY;
 	Py_RETURN_NONE;
 }
 
@@ -597,7 +598,8 @@ static PyObject *Image_setPixelI( BPy_Image * self, PyObject * args )
 	pixel[index + 1] = ( char ) p[1];
 	pixel[index + 2] = ( char ) p[2];
 	pixel[index + 3] = ( char ) p[3];
-
+	
+	ibuf->userflags |= IB_BITMAPDIRTY;
 	Py_RETURN_NONE;
 }
 
@@ -671,18 +673,21 @@ static PyObject *Image_unpack( BPy_Image * self, PyObject * args )
 static PyObject *Image_pack( BPy_Image * self )
 {
 	Image *image = self->image;	
-	char expandpath[FILE_MAXDIR + FILE_MAXFILE];
-	BLI_strncpy(expandpath, image->name, FILE_MAXDIR+FILE_MAXFILE);
-	BLI_convertstringcode(expandpath, G.sce, 1);
-
-	if (image->packedfile )
-		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					      "image alredy packed" );
-	if (!BLI_exists(expandpath))
+	ImBuf *ibuf = BKE_image_get_ibuf(image, NULL);
+	
+	if( !ibuf || !ibuf->rect )	/* didn't work */
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-					      "image path does not exist" );
-		
-	image->packedfile = newPackedFile(image->name);
+				      "couldn't load image data in Blender" );
+	
+	if (image->packedfile ) { /* RePack? */
+		if (ibuf->userflags & IB_BITMAPDIRTY)
+			BKE_image_memorypack(image);
+	} else { /* Pack for the first time */
+		if (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))
+			BKE_image_memorypack(image);
+		else
+			image->packedfile = newPackedFile(image->name);
+	}
 	Py_RETURN_NONE;
 }