sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix possible NULL pointer dereference in Cycles

Browse Source
This commit is contained in:
Campbell Barton 2014-05-07 04:18:58 +10:00
parent 6dbe732a2f
commit f300c158b9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/object.cpp
View File

@ -189,11 +189,12 @@ vector<float> Object::motion_times()
{
/* compute times at which we sample motion for this object */
vector<float> times;
int motion_steps = mesh->motion_steps;
if(!mesh || motion_steps == 1)
if(!mesh || mesh->motion_steps == 1)
return times;
int motion_steps = mesh->motion_steps;
for(int step = 0; step < motion_steps; step++) {
if(step != motion_steps / 2) {
float time = 2.0f * step / (motion_steps - 1) - 1.0f;