[Bf-blender-cvs] [634da45] master: Added changes to show textures as part of line styles in the Outliner.

Tamito Kajiyama noreply at git.blender.org
Sat May 3 13:39:34 CEST 2014


Commit: 634da4598e11e2fefdb0cc4170edb9d9123a2835
Author: Tamito Kajiyama
Date:   Wed Apr 23 15:07:04 2014 +0900
https://developer.blender.org/rB634da4598e11e2fefdb0cc4170edb9d9123a2835

Added changes to show textures as part of line styles in the Outliner.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 76a0839..1d5a70a 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -794,9 +794,14 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 		case ID_LS:
 		{
 			FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
+			int a;
 			
 			if (outliner_animdata_test(linestyle->adt))
 				outliner_add_element(soops, &te->subtree, linestyle, te, TSE_ANIM_DATA, 0);
+
+			for (a = 0; a < MAX_MTEX; a++) {
+				if (linestyle->mtex[a]) outliner_add_element(soops, &te->subtree, linestyle->mtex[a]->tex, te, 0, a);
+			}
 			break;
 		}
 	}




More information about the Bf-blender-cvs mailing list