New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Sphere Object to sphere function in viz.actors #59

Merged
merged 10 commits into from Jun 8, 2018

Conversation

Projects
None yet
2 participants
@thechargedneutron
Copy link

thechargedneutron commented Jun 7, 2018

Rebasing the work done here.

@Garyfallidis

This comment has been minimized.

Copy link
Owner

Garyfallidis commented Jun 8, 2018

Hey @thechargedneutron you have conflicts can you resolve them? You can use the "resolve conflicts" button.

thechargedneutron added some commits Jun 8, 2018

@@ -598,7 +598,7 @@ def add_timer_callback(self, repeat, duration, timer_callback):
def destroy_timer(self, timer_id):
self.iren.DestroyTimer(timer_id)

def destroy_timers(self):
def destroy_timers(self):

This comment has been minimized.

@Garyfallidis

Garyfallidis Jun 8, 2018

Owner

Bad indentation?

This comment has been minimized.

@thechargedneutron

thechargedneutron Jun 8, 2018

Author

Thanks. Corrected !!

@Garyfallidis Garyfallidis merged commit 58316d2 into Garyfallidis:many_spheres Jun 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment