dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e91f33101ff0999e07f7ce941f31dca793d954e7
goo-engine/source/blender/python/intern
T
History
Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. 
Conflicts resolved:
source/blender/editors/interface/resources.c
2012-09-30 13:16:55 +00:00
..
bpy_app_ffmpeg.c
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
bpy_app_ffmpeg.h
…
bpy_app_handlers.c
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
bpy_app_handlers.h
…
bpy_app.c
code cleanup: rename G.rt to G.debug_value
2012-08-08 18:21:54 +00:00
bpy_app.h
…
bpy_driver.c
…
bpy_driver.h
…
bpy_interface_atexit.c
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
bpy_interface.c
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
bpy_intern_string.c
…
bpy_intern_string.h
…
bpy_library.c
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
bpy_library.h
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
bpy_operator_wrap.c
…
bpy_operator_wrap.h
…
bpy_operator.c
style cleanup
2012-08-22 16:44:32 +00:00
bpy_operator.h
…
bpy_props.c
add warning that RNA update callbacks dont have checks for infinite recursion.
2012-09-28 09:35:32 +00:00
bpy_props.h
…
bpy_rna_anim.c
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
bpy_rna_anim.h
…
bpy_rna_array.c
code cleanup: spelling
2012-07-16 23:23:33 +00:00
bpy_rna_callback.c
…
bpy_rna_callback.h
…
bpy_rna.c
code cleanup: correct spelling
2012-09-28 06:45:20 +00:00
bpy_rna.h
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
bpy_traceback.c
…
bpy_traceback.h
…
bpy_util.c
style cleanup
2012-09-30 06:12:47 +00:00
bpy_util.h
…
bpy.c
Merged changes in the trunk up to revision 50956.
2012-09-30 13:16:55 +00:00
bpy.h
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
CMakeLists.txt
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
gpu.c
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00
gpu.h
code cleanup: correct spelling
2012-09-28 06:45:20 +00:00
stubs.c
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
2012-09-15 01:52:28 +00:00