RepSphereGenerate.cpp (pymol-open-source-2.2.0) | : | RepSphereGenerate.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 37 | skipping to change at line 37 | |||
short use_shader; | short use_shader; | |||
int ok = true; | int ok = true; | |||
int sphere_quality = SettingGet_i(G, I->R.cs->Setting, I->R.obj->Setting, | int sphere_quality = SettingGet_i(G, I->R.cs->Setting, I->R.obj->Setting, | |||
cSetting_sphere_quality); | cSetting_sphere_quality); | |||
use_shader = SettingGetGlobal_b(G, cSetting_sphere_use_shader) && | use_shader = SettingGetGlobal_b(G, cSetting_sphere_use_shader) && | |||
SettingGetGlobal_b(G, cSetting_use_shaders); | SettingGetGlobal_b(G, cSetting_use_shaders); | |||
// generate the CGO | // generate the CGO | |||
if (use_shader) { | if (use_shader) { | |||
CGO *convertcgo = CGOSimplify(I->primitiveCGO, 0, sphere_quality), *convertc | CGO *convertcgo = CGOSimplify(I->primitiveCGO, 0, sphere_quality); | |||
go2; | CGO *convertcgo2 = nullptr; | |||
CHECKOK(ok, convertcgo); | CHECKOK(ok, convertcgo); | |||
if (ok) | if (ok) | |||
convertcgo2 = CGOCombineBeginEnd(convertcgo, 0); | convertcgo2 = CGOCombineBeginEnd(convertcgo, 0); | |||
CHECKOK(ok, convertcgo2); | CHECKOK(ok, convertcgo2); | |||
if (ok){ | if (ok){ | |||
I->renderCGO = CGOOptimizeToVBONotIndexed(convertcgo2, 0); | I->renderCGO = CGOOptimizeToVBONotIndexed(convertcgo2, 0); | |||
I->renderCGO->use_shader = use_shader; | I->renderCGO->use_shader = use_shader; | |||
} | } | |||
CGOFree(convertcgo2); | CGOFree(convertcgo2); | |||
CGOFree(convertcgo); | CGOFree(convertcgo); | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |