"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Rep.cpp" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Rep.cpp  (pymol-open-source-2.2.0)	:	Rep.cpp  (pymol-open-source-2.3.0)
skipping to change at line 32		skipping to change at line 32
#include"main.h"		#include"main.h"
#include"Feedback.h"		#include"Feedback.h"
#include"Rep.h"		#include"Rep.h"
#include"MemoryDebug.h"		#include"MemoryDebug.h"
#include"CoordSet.h"		#include"CoordSet.h"
#include"P.h"		#include"P.h"
#include"Util.h"		#include"Util.h"
/*========================================================================*/		/*========================================================================*/
		static
struct Rep *RepUpdate(struct Rep *I, struct CoordSet *cs, int state, int rep);
struct Rep *RepRebuild(struct Rep *I, struct CoordSet *cs, int state, int rep);
/*========================================================================*/
struct Rep *RepRebuild(struct Rep *I, struct CoordSet *cs, int state, int rep)		struct Rep *RepRebuild(struct Rep *I, struct CoordSet *cs, int state, int rep)
{		{
Rep *tmp = NULL;		Rep *tmp = NULL;
PRINTFD(I->G, FB_Rep)		PRINTFD(I->G, FB_Rep)
" RepRebuild-Debug: entered: rep %d I->fNew %p\n", rep, (void *) I->fNew END FD;		" RepRebuild-Debug: entered: rep %d I->fNew %p\n", rep, (void *) I->fNew END FD;
if(I->fNew) {		if(I->fNew) {
tmp = I->fNew(cs, state);		tmp = I->fNew(cs, state);
if(tmp) {		if(tmp) {
skipping to change at line 59		skipping to change at line 55
} else { /* nothing returned -- visibility is zero... */		} else { /* nothing returned -- visibility is zero... */
cs->Active[rep] = false; /* keep the old object around, but inactive */		cs->Active[rep] = false; /* keep the old object around, but inactive */
tmp = I;		tmp = I;
}		}
} else		} else
I->fFree(I);		I->fFree(I);
return (tmp);		return (tmp);
}		}
/*========================================================================*/		/*========================================================================*/
		static
struct Rep *RepUpdate(struct Rep *I, struct CoordSet *cs, int state, int rep)		struct Rep *RepUpdate(struct Rep *I, struct CoordSet *cs, int state, int rep)
{		{
PRINTFD(I->G, FB_Rep)		PRINTFD(I->G, FB_Rep)
" RepUpdate-Debug: entered: rep %d I->MaxInvalid %d\n", rep, I->MaxInvalid E NDFD;		" RepUpdate-Debug: entered: rep %d I->MaxInvalid %d\n", rep, I->MaxInvalid E NDFD;
if(I->MaxInvalid) {		if(I->MaxInvalid) {
if(I->MaxInvalid == cRepInvPick) {		if(I->MaxInvalid == cRepInvPick) {
if((rep == cRepLine) ||		if((rep == cRepLine) ||
(rep == cRepCyl) || (rep == cRepRibbon) || (rep == cRepNonbonded))		(rep == cRepCyl) || (rep == cRepRibbon) || (rep == cRepNonbonded))
End of changes. 2 change blocks.
5 lines changed or deleted		2 lines changed or added

---