[Bf-blender-cvs] [78fb724] master: Added changes to unlink textures from line styles in the Outliner.

[Tamito Kajiyama]

Commit: 78fb7249c68d86ae68e3062739c0a450c7f6ed1f
Author: Tamito Kajiyama
Date:   Wed Apr 23 15:08:41 2014 +0900
https://developer.blender.org/rB78fb7249c68d86ae68e3062739c0a450c7f6ed1f

Added changes to unlink textures from line styles in the Outliner.

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

M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index dce3c7c..5faa7b9 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -35,6 +35,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_group_types.h"
 #include "DNA_lamp_types.h"
+#include "DNA_linestyle_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
@@ -191,6 +192,10 @@ static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeEle
 		World *wrld = (World *)tsep->id;
 		mtex = wrld->mtex;
 	}
+	else if (GS(tsep->id->name) == ID_LS) {
+		FreestyleLineStyle *ls = (FreestyleLineStyle *)tsep->id;
+		mtex = ls->mtex;
+	}
 	else {
 		return;
 	}