TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge various fixes from branch 'release/1.9.x'

Browse Source 
Conflicts:
	panda/src/gobj/texture.cxx
This commit is contained in:
rdb 2015-04-16 17:11:20 +02:00
commit ab1c516ebc
3 changed files with 592 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/directscripts/extract_docs.py
View File

@ -203,6 +203,11 @@ def processType(handle, type):
if docstring:
print >>handle, docstring
print >>handle, interrogate_type_enum_value_name(type, i_value), "=", interrogate_type_enum_value(type, i_value), ","
elif interrogate_type_is_typedef(type):
wrapped_type = translated_type_name(interrogate_type_wrapped_type(type))
print >>handle, "typedef %s %s;" % (wrapped_type, typename)
return
else:
if interrogate_type_is_struct(type):
classtype = "struct"
@ -211,7 +216,7 @@ def processType(handle, type):
elif interrogate_type_is_union(type):
classtype = "union"
else:
print "I don't know what type %s is" % typename
print "I don't know what type %s is" % interrogate_type_true_name(type)
return
if len(derivations) > 0:

1154
dtool/metalibs/dtoolconfig/pydtool.cxx
View File

File diff suppressed because it is too large Load Diff

2
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -2636,7 +2636,7 @@ write_module_class(ostream &out, Object *obj) {
write_function_slot(out, 2, slots, "bf_getsegcount");
write_function_slot(out, 2, slots, "bf_getcharbuffer");
out << "#endif\n";
out << "#if PY_MAJOR_VERSION >= 0x02060000\n";
out << "#if PY_VERSION_HEX >= 0x02060000\n";
write_function_slot(out, 2, slots, "bf_getbuffer");
write_function_slot(out, 2, slots, "bf_releasebuffer");
out << "#endif\n";