Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(392)

Side by Side Diff: source/blender/blenkernel/intern/node.c

Issue 6242069: Particle Info node for Cycles Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Improvements suggested by Brecht Created 12 years, 9 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * ***** BEGIN GPL LICENSE BLOCK ***** 2 * ***** BEGIN GPL LICENSE BLOCK *****
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License 5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 2 6 * as published by the Free Software Foundation; either version 2
7 * of the License, or (at your option) any later version.· 7 * of the License, or (at your option) any later version.·
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 ················ 1946 ················
1947 /* Workaround for copying an action on each render! 1947 /* Workaround for copying an action on each render!
1948 * set action to NULL so animdata actions don't get copied */ 1948 * set action to NULL so animdata actions don't get copied */
1949 AnimData *adt = BKE_animdata_from_id(&ntree->id); 1949 AnimData *adt = BKE_animdata_from_id(&ntree->id);
1950 ········ 1950 ········
1951 if (adt) { 1951 if (adt) {
1952 action_backup = adt->action; 1952 action_backup = adt->action;
1953 tmpact_backup = adt->tmpact; 1953 tmpact_backup = adt->tmpact;
1954 ········ 1954 ········
1955 adt->action = NULL; 1955 adt->action = NULL;

error: old chunk mismatch

OLDNEW

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b