RepCylBond.cpp (pymol-v1.8.6.0.tar.bz2) | : | RepCylBond.cpp (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 1397 | skipping to change at line 1397 | |||
I->Vcgo = 0; | I->Vcgo = 0; | |||
I->VPcgo = 0; | I->VPcgo = 0; | |||
PRINTFD(G, FB_RepCylBond) | PRINTFD(G, FB_RepCylBond) | |||
" RepCylBondNew-Debug: entered.\n" ENDFD; | " RepCylBondNew-Debug: entered.\n" ENDFD; | |||
obj = cs->Obj; | obj = cs->Obj; | |||
/* if shaders are off, valences are on, and stick_ball is on, then we need to filter stick_balls to not show | /* if shaders are off, valences are on, and stick_ball is on, then we need to filter stick_balls to not show | |||
on atoms with a single bond */ | on atoms with a single bond */ | |||
stick_ball_filter_single_atoms = SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_valence) && | stick_ball_filter_single_atoms = SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_valence) && | |||
SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_stick_ball) | SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_stick_ball) | |||
&& !SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_use_shaders); | && !SettingGet_b(G, cs->Setting, obj->Obj.Setti ng, cSetting_use_shaders); | |||
// breaks ray tracing with valence + stick_ball | ||||
stick_ball_filter_single_atoms = 0; | ||||
visFlag = false; | visFlag = false; | |||
b = obj->Bond; | b = obj->Bond; | |||
ai1 = obj->AtomInfo; | ai1 = obj->AtomInfo; | |||
if(obj->RepVisCache & cRepCylBit) | if(obj->RepVisCache & cRepCylBit) | |||
for(a = 0; a < obj->NBond; a++) { | for(a = 0; a < obj->NBond; a++) { | |||
b1 = b->index[0]; | b1 = b->index[0]; | |||
b2 = b->index[1]; | b2 = b->index[1]; | |||
if((cRepCylBit & | if((cRepCylBit & | |||
ai1[b1].visRep & | ai1[b1].visRep & | |||
ai1[b2].visRep)) { | ai1[b2].visRep)) { | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |