Commit: 7046f4afe046ccf358912a8949a256bb52795c9e
Author: Kévin Dietrich
Date: Thu Jun 30 01:19:33 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB7046f4afe046ccf358912a8949a256bb52795c9e
Merge branch 'master' into alembic_basic_io
===================================================================
===================================================================
diff --cc source/blender/blenloader/CMakeLists.txt
index ae8ec80,479d3a1..8cb9ef8
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@@ -73,11 -77,7 +77,14 @@@ if(WITH_CODEC_FFMPEG
add_definitions(-DWITH_FFMPEG)
endif()
+if(WITH_ALEMBIC)
+ list(APPEND INC
+ ../alembic
+ )
+ add_definitions(-DWITH_ALEMBIC)
+endif()
+
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
+
+ # needed so writefile.c can use dna_type_offsets.h
+ add_dependencies(bf_blenloader bf_dna)
diff --cc source/blender/blenloader/intern/writefile.c
index d4889e2,19fb80f..1b1154b
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3746,43 -4017,42 +4033,43 @@@ static bool write_file_handle
write_global(wd, write_flags, mainvar);
write_windowmanagers(wd, &mainvar->wm);
- write_screens (wd, &mainvar->screen);
- write_movieclips (wd, &mainvar->movieclip);
- write_masks (wd, &mainvar->mask);
- write_scenes (wd, &mainvar->scene);
- write_curves (wd, &mainvar->curve);
- write_mballs (wd, &mainvar->mball);
- write_images (wd, &mainvar->image);
- write_cameras (wd, &mainvar->camera);
- write_lamps (wd, &mainvar->lamp);
- write_lattices (wd, &mainvar->latt);
- write_vfonts (wd, &mainvar->vfont);
- write_keys (wd, &mainvar->key);
- write_worlds (wd, &mainvar->world);
- write_texts (wd, &mainvar->text);
- write_speakers (wd, &mainvar->speaker);
- write_sounds (wd, &mainvar->sound);
- write_groups (wd, &mainvar->group);
+ write_screens(wd, &mainvar->screen);
+ write_movieclips(wd, &mainvar->movieclip);
+ write_masks(wd, &mainvar->mask);
+ write_scenes(wd, &mainvar->scene);
+ write_curves(wd, &mainvar->curve);
+ write_mballs(wd, &mainvar->mball);
+ write_images(wd, &mainvar->image);
+ write_cameras(wd, &mainvar->camera);
+ write_lamps(wd, &mainvar->lamp);
+ write_lattices(wd, &mainvar->latt);
+ write_vfonts(wd, &mainvar->vfont);
+ write_keys(wd, &mainvar->key);
+ write_worlds(wd, &mainvar->world);
+ write_texts(wd, &mainvar->text);
+ write_speakers(wd, &mainvar->speaker);
+ write_sounds(wd, &mainvar->sound);
+ write_groups(wd, &mainvar->group);
write_armatures(wd, &mainvar->armature);
- write_actions (wd, &mainvar->action);
- write_objects (wd, &mainvar->object);
+ write_actions(wd, &mainvar->action);
+ write_objects(wd, &mainvar->object);
write_materials(wd, &mainvar->mat);
- write_textures (wd, &mainvar->tex);
- write_meshes (wd, &mainvar->mesh);
+ write_textures(wd, &mainvar->tex);
+ write_meshes(wd, &mainvar->mesh);
write_particlesettings(wd, &mainvar->particle);
write_nodetrees(wd, &mainvar->nodetree);
- write_brushes (wd, &mainvar->brush);
- write_palettes (wd, &mainvar->palettes);
- write_paintcurves (wd, &mainvar->paintcurves);
- write_gpencils (wd, &mainvar->gpencil);
+ write_brushes(wd, &mainvar->brush);
+ write_palettes(wd, &mainvar->palettes);
+ write_paintcurves(wd, &mainvar->paintcurves);
+ write_gpencils(wd, &mainvar->gpencil);
write_linestyles(wd, &mainvar->linestyle);
+ write_cachefiles(wd, &mainvar->cachefiles);
write_libraries(wd, mainvar->next);
- if (write_user_block) {
+ if (write_flags & G_FILE_USERPREFS) {
write_userdef(wd);
}
-
+
/* dna as last, because (to be implemented) test for which structs are
written */
writedata(wd, DNA1, wd->sdna->datalen, wd->sdna->data);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
