[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31229] trunk/blender/source/blender: bugfix [#23247] Load Image in Textures does not use a usefull path

[Campbell Barton]

Revision: 31229
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31229
Author:   campbellbarton
Date:     2010-08-11 05:31:56 +0200 (Wed, 11 Aug 2010)

Log Message:
-----------
bugfix [#23247] Load Image in Textures does not use a usefull path

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/makesdna/DNA_texture_types.h
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2010-08-11 02:31:54 UTC (rev 31228)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2010-08-11 03:31:56 UTC (rev 31229)
@@ -739,8 +739,24 @@
 static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	SpaceImage *sima= CTX_wm_space_image(C);
-	char *path= (sima && sima->image)? sima->image->name: U.textudir;
+	char *path=U.textudir;
+	Image *ima= NULL;
 
+	if(sima) {
+		 ima= sima->image;
+	}
+
+	if (ima==NULL) {
+		 SpaceButs *sbuts= CTX_wm_space_buts(C);
+		 Tex *tex= CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
+		 if(tex && tex->type==TEX_IMAGE)
+			 ima= tex->ima;
+	}
+
+	if(ima)
+		path= ima->name;
+	
+
 	if(!RNA_property_is_set(op->ptr, "relative_path"))
 		RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
 

Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h	2010-08-11 02:31:54 UTC (rev 31228)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h	2010-08-11 03:31:56 UTC (rev 31229)
@@ -32,7 +32,7 @@
 #define DNA_TEXTURE_TYPES_H
 
 #include "DNA_ID.h"
-#include "DNA_image_types.h"
+#include "DNA_image_types.h" /* ImageUser */
 
 struct AnimData;
 struct Ipo;

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-08-11 02:31:54 UTC (rev 31228)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-08-11 03:31:56 UTC (rev 31229)
@@ -33,7 +33,7 @@
 #define DNA_USERDEF_TYPES_H
 
 #include "DNA_listBase.h"
-#include "DNA_texture_types.h"
+#include "DNA_texture_types.h" /* ColorBand */
 
 /* themes; defines in BIF_resource.h */
 struct ColorBand;