intern/cycles/render/object.h - Issue 6242069: Particle Info node for Cycles

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: intern/cycles/render/object.h

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

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

Index: intern/cycles/render/object.h

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

--- intern/cycles/render/object.h (revision 47606)

+++ intern/cycles/render/object.h (working copy)

@@ -35,6 +35,11 @@

/* Object */

+struct Particle {

+ float age;

+ float lifetime;

+};

class Object {

public:

Mesh *mesh;

@@ -49,6 +54,9 @@

bool use_motion;

bool use_holdout;

+ int particle_id;

+ vector<Particle> particles;

Object();

~Object();

@@ -69,6 +77,7 @@

void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);

void device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);

+ void device_update_particles(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);

void device_free(Device *device, DeviceScene *dscene);

void tag_update(Scene *scene);