projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a158cb4
6b75a99
)
Mango request: option to clamp result of Mix RGB and Color Math nodes
author
Sergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2012 10:36:18 +0000
(10:36 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2012 10:36:18 +0000
(10:36 +0000)
---
Merging r48792 from soc-2011-tomato into trunk
1
2
source/blender/editors/space_node/drawnode.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/intern/rna_nodetree.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/space_node/drawnode.c
Simple merge
diff --cc
source/blender/makesrna/intern/rna_nodetree.c
Simple merge
projects / blender-staging.git / commitdiff