diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx index 1ac9fb40ff..eb6bd81171 100644 --- a/direct/src/dcparser/dcClass.cxx +++ b/direct/src/dcparser/dcClass.cxx @@ -885,12 +885,13 @@ ai_format_generate(PyObject *distobj, int do_id, // Description: Generates a datagram containing the message necessary // to create a new database distributed object from the AI. // -// First Pass is to only incldue required values(with Defaults). +// First Pass is to only incldue required values +// (with Defaults). //////////////////////////////////////////////////////////////////// Datagram DCClass:: -ai_database_generate_context(int context_id, - int parent_id, int zone_id, - CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const +ai_database_generate_context( + int context_id, int parent_id, int zone_id, + CHANNEL_TYPE database_server_id, CHANNEL_TYPE from_channel_id) const { DCPacker packer; packer.RAW_PACK_CHANNEL(database_server_id); @@ -906,8 +907,7 @@ ai_database_generate_context(int context_id, int num_fields = get_num_inherited_fields(); for (int i = 0; i < num_fields; ++i) { DCField *field = get_inherited_field(i); - if (field->is_required() && field->as_molecular_field() == NULL) - { + if (field->is_required() && field->as_molecular_field() == NULL) { packer.begin_pack(field); packer.pack_default_value(); packer.end_pack(); diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py index c8c738c871..d34361d1eb 100644 --- a/direct/src/gui/DirectGuiBase.py +++ b/direct/src/gui/DirectGuiBase.py @@ -614,8 +614,8 @@ class DirectGuiBase(PandaObject.PandaObject): def destroy(self): # Clean out any hooks self.ignoreAll() - del(self._optionInfo) - del(self.__componentInfo) + del self._optionInfo + del self.__componentInfo del self.postInitialiseFuncList def bind(self, event, command, extraArgs = []): @@ -999,9 +999,9 @@ class DirectGuiWidget(DirectGuiBase, NodePath): def printConfig(self, indent = 0): space = ' ' * indent - print space + self.guiId - print space + 'Pos: ' + `self.getPos()` - print space + 'Scale: ' + `self.getScale()` + print space + self.guiId, '-', self.__class__.__name__ + print space + 'Pos: ' + self.getPos().pPrintValues() + print space + 'Scale: ' + self.getScale().pPrintValues() # Print out children info for child in self.getChildrenAsList(): messenger.send(PRINT + child.getName(), [indent + 2])