diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-04 13:05:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-04 13:05:11 +0300 |
| commit | 343c4fb54a514b55a9d0e01fc1275fa66bf1fbca (patch) | |
| tree | 78ab1fd1f77af1c467e98cc31e940845e0737aee /source/blender/editors/space_view3d/drawobject.c | |
| parent | 44276743cfb31996f90a19c6d98839bea3cc1ce4 (diff) | |
| parent | cf7a5e93f8d89d8b5382b07834dd0e9fc694254b (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
intern/cycles/kernel/svm/svm.h
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index c040045b598..2aa57fe1cad 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6191,7 +6191,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit) PTCacheEditPoint *point; PTCacheEditKey *key; ParticleEditSettings *pset = PE_settings(scene); - int i, k, totpoint = edit->totpoint, timed = pset->flag & PE_FADE_TIME ? pset->fade_frames : 0; + int i, k, totpoint = edit->totpoint, timed = (pset->flag & PE_FADE_TIME) ? pset->fade_frames : 0; int totkeys = 1; float sel_col[3]; float nosel_col[3]; @@ -6331,7 +6331,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit) glColor3fv(nosel_col); /* has to be like this.. otherwise selection won't work, have try glArrayElement later..*/ glBegin(GL_POINTS); - glVertex3fv(key->flag & PEK_USE_WCO ? key->world_co : key->co); + glVertex3fv((key->flag & PEK_USE_WCO) ? key->world_co : key->co); glEnd(); } } |