Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-04-23 10:07:04 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-03 15:38:43 +0400
commit634da4598e11e2fefdb0cc4170edb9d9123a2835 (patch)
tree8e22b8dfcc3ff43ea3afd9abe9257ee2e716dd23 /source/blender/editors/space_outliner/outliner_tree.c
parent3c3759ac9e609aced3e751a50fc67462ae6dfc7a (diff)
Added changes to show textures as part of line styles in the Outliner.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 76a0839d2d6..1d5a70a0d6f 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;
}
}