diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-03 15:48:16 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-03 15:48:16 +0300 |
| commit | 8a2a7687f4a7eecd49996251303b5eaed23d995d (patch) | |
| tree | 5f06cd44db96b9b23b96141d5b867dfc4316e7a5 /source/blender/blenkernel/intern | |
| parent | 486c3cd937782bb7bb7feae3bc6ecf9a65141fd6 (diff) | |
Bugfix #25457
After loading file, the Undo-push happened too early, causing an
undo for the first action to show animated setups wrong.
(material.c: removed old crap)
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index dae00636370..3f18e7f3723 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1341,7 +1341,6 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col) /* copy/paste buffer, if we had a propper py api that would be better */ Material matcopybuf; -// MTex mtexcopybuf; static short matcopied=0; void clear_matcopybuf(void) @@ -1352,7 +1351,6 @@ void clear_matcopybuf(void) void free_matcopybuf(void) { -// extern MTex mtexcopybuf; /* buttons.c */ int a; for(a=0; a<MAX_MTEX; a++) { @@ -1373,7 +1371,6 @@ void free_matcopybuf(void) MEM_freeN(matcopybuf.nodetree); matcopybuf.nodetree= NULL; } -// default_mtex(&mtexcopybuf); matcopied= 0; } @@ -1442,10 +1439,4 @@ void paste_matcopybuf(Material *ma) } ma->nodetree= ntreeCopyTree(matcopybuf.nodetree, 0); - - /* - BIF_preview_changed(ID_MA); - BIF_undo_push("Paste material settings"); - scrarea_queue_winredraw(curarea); - */ } |