Ton Roosendaal
87365d8d40
-> Note; added 2 new c files (split editipo.c). MSVC needs upgrade. Impatient people can check the goodies in CMS: http://www.blender3d.org/cms/Action_and_NLA_editor.706.0.html Most work was on trying to unwind the spaghetti for editing ipos. Too much history and bad design got added here. Most evident changes: - made generic 'context' for detecting which Ipo is being edited, or to assign ipos or to retrieve ipo curves. - made generic insertkey() for all ipo types, including actions - shuffled a lot of code around to make things more logical. Also made sure local functions are not exported It is far from ready... when action/nla was added in Blender, a lot of duplicate code was generated. That's for another time. Now the goodies; - made Actions to allow any Ipo type - made NLA to define active actions, for Action window too - corrected timing for active action, so it shows the 'real time', as defined in NLA editor. I did update python code, but that would require testing. Testing is needed for this commit in general, too many changes happened on all levels of the animation system. :) Will keep track of all reports this evening, hopefully it doesnt break the pre-release schedule!
175 lines
5.8 KiB
Python
175 lines
5.8 KiB
Python
#!/usr/bin/python
|
|
Import ('extra_includes')
|
|
Import ('user_options_dict')
|
|
Import ('library_env')
|
|
|
|
src_env = library_env.Copy ()
|
|
src_env.Append (CCFLAGS = user_options_dict['SDL_CFLAGS'])
|
|
|
|
source_files = ['B.blend.c',
|
|
'Bfont.c',
|
|
'bfont.ttf.c',
|
|
'blenderbuttons.c',
|
|
'booleanops.c',
|
|
'booleanops_mesh.c',
|
|
'buttons_editing.c',
|
|
'buttons_logic.c',
|
|
'buttons_object.c',
|
|
'buttons_scene.c',
|
|
'buttons_script.c',
|
|
'buttons_shading.c',
|
|
'butspace.c',
|
|
'cmap.tga.c',
|
|
'cmovie.tga.c',
|
|
'cursors.c',
|
|
'drawaction.c',
|
|
'drawarmature.c',
|
|
'drawdeps.c',
|
|
'drawimage.c',
|
|
'drawimasel.c',
|
|
'drawipo.c',
|
|
'drawmesh.c',
|
|
'drawnla.c',
|
|
'drawobject.c',
|
|
'drawoops.c',
|
|
'drawscene.c',
|
|
'drawscript.c',
|
|
'drawseq.c',
|
|
'drawsound.c',
|
|
'drawtext.c',
|
|
'drawtime.c',
|
|
'drawview.c',
|
|
'edit.c',
|
|
'editaction.c',
|
|
'editarmature.c',
|
|
'editconstraint.c',
|
|
'editcurve.c',
|
|
'editdeform.c',
|
|
'editface.c',
|
|
'editfont.c',
|
|
'editgroup.c',
|
|
'editimasel.c',
|
|
'editipo.c',
|
|
'editipo_lib.c',
|
|
'editipo_mods.c',
|
|
'editkey.c',
|
|
'editlattice.c',
|
|
'editmball.c',
|
|
'editmesh.c',
|
|
'editmesh_add.c',
|
|
'editmesh_lib.c',
|
|
'editmesh_loop.c',
|
|
'editmesh_mods.c',
|
|
'editmesh_tools.c',
|
|
'editmode_undo.c',
|
|
'editnla.c',
|
|
'editobject.c',
|
|
'editoops.c',
|
|
'editscreen.c',
|
|
'editseq.c',
|
|
'editsima.c',
|
|
'editsound.c',
|
|
'edittime.c',
|
|
'editview.c',
|
|
'eventdebug.c',
|
|
'filesel.c',
|
|
'fluidsim.c',
|
|
'ghostwinlay.c',
|
|
'glutil.c',
|
|
'headerbuttons.c',
|
|
'header_action.c',
|
|
'header_buttonswin.c',
|
|
'header_filesel.c',
|
|
'header_image.c',
|
|
'header_imasel.c',
|
|
'header_info.c',
|
|
'header_ipo.c',
|
|
'header_nla.c',
|
|
'header_oops.c',
|
|
'header_script.c',
|
|
'header_seq.c',
|
|
'header_sound.c',
|
|
'header_text.c',
|
|
'header_time.c',
|
|
'header_view3d.c',
|
|
'imagepaint.c',
|
|
'imasel.c',
|
|
'interface.c',
|
|
'interface_panel.c',
|
|
'interface_draw.c',
|
|
'keyval.c',
|
|
'lorem.c',
|
|
'mainqueue.c',
|
|
'meshtools.c',
|
|
'mywindow.c',
|
|
'oops.c',
|
|
'outliner.c',
|
|
'splash.jpg.c',
|
|
'playanim.c',
|
|
'poseobject.c',
|
|
'previewrender.c',
|
|
'renderwin.c',
|
|
'resources.c',
|
|
'scrarea.c',
|
|
'screendump.c',
|
|
'sequence.c',
|
|
'seqaudio.c',
|
|
'space.c',
|
|
'spacetypes.c',
|
|
'swapbuffers.c',
|
|
'toets.c',
|
|
'toolbox.c',
|
|
'transform.c',
|
|
'transform_generics.c',
|
|
'transform_numinput.c',
|
|
'transform_constraints.c',
|
|
'transform_conversions.c',
|
|
'transform_manipulator.c',
|
|
'unwrapper.c',
|
|
'usiblender.c',
|
|
'view.c',
|
|
'vpaint.c',
|
|
'writeavicodec.c',
|
|
'writeimage.c',
|
|
'writemovie.c',
|
|
'language.c']
|
|
|
|
src_env.Append (CPPPATH = ['#/intern/guardedalloc',
|
|
'../blenlib',
|
|
'../makesdna',
|
|
'../blenkernel',
|
|
'../include',
|
|
'#/intern/bmfont',
|
|
'../imbuf',
|
|
'../render/extern/include',
|
|
'#/intern/bsp/extern',
|
|
'../renderconverter',
|
|
'../radiosity/extern/include',
|
|
'#/intern/decimation/extern',
|
|
'../blenloader',
|
|
'../python',
|
|
'../../kernel/gen_system',
|
|
'#/intern/SoundSystem',
|
|
'../readstreamglue',
|
|
'../img',
|
|
'../quicktime',
|
|
'#/intern/elbeem/extern',
|
|
'#/intern/ghost',
|
|
'#/intern/opennl/extern'])
|
|
|
|
src_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE'])
|
|
src_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE'])
|
|
src_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE'])
|
|
|
|
if user_options_dict['USE_INTERNATIONAL'] == 1:
|
|
src_env.Append (CPPPATH=['../ftfont'])
|
|
src_env.Append (CPPDEFINES = 'INTERNATIONAL')
|
|
src_env.Append (CPPDEFINES = 'FTGL_STATIC_LIBRARY')
|
|
|
|
if user_options_dict['USE_BUILDINFO'] == 1:
|
|
src_env.Append (CPPDEFINES = 'NAN_BUILDINFO')
|
|
|
|
src_env.Append (CPPPATH=extra_includes)
|
|
|
|
src_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blendersrc', source=source_files)
|