Commit: e9964ed175512149aebcb582cd24005007ed7790
Author: Antonio Vazquez
Date: Tue Jun 12 12:40:39 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe9964ed175512149aebcb582cd24005007ed7790
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/anim_sys.c
index 910a71bf31b,ec979623a98..26727ce77b7
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@@ -1089,70 -1091,67 +1092,70 @@@ void BKE_animdata_main_cb(Main *bmain,
} (void)0
/* nodes */
- ANIMDATA_IDS_CB(mainptr->nodetree.first);
+ ANIMDATA_IDS_CB(bmain->nodetree.first);
/* textures */
- ANIMDATA_NODETREE_IDS_CB(mainptr->tex.first, Tex);
+ ANIMDATA_NODETREE_IDS_CB(bmain->tex.first, Tex);
/* lamps */
- ANIMDATA_NODETREE_IDS_CB(mainptr->lamp.first, Lamp);
+ ANIMDATA_NODETREE_IDS_CB(bmain->lamp.first, Lamp);
/* materials */
- ANIMDATA_NODETREE_IDS_CB(mainptr->mat.first, Material);
+ ANIMDATA_NODETREE_IDS_CB(bmain->mat.first, Material);
/* cameras */
- ANIMDATA_IDS_CB(mainptr->camera.first);
+ ANIMDATA_IDS_CB(bmain->camera.first);
/* shapekeys */
- ANIMDATA_IDS_CB(mainptr->key.first);
+ ANIMDATA_IDS_CB(bmain->key.first);
/* metaballs */
- ANIMDATA_IDS_CB(mainptr->mball.first);
+ ANIMDATA_IDS_CB(bmain->mball.first);
/* curves */
- ANIMDATA_IDS_CB(mainptr->curve.first);
+ ANIMDATA_IDS_CB(bmain->curve.first);
/* armatures */
- ANIMDATA_IDS_CB(mainptr->armature.first);
+ ANIMDATA_IDS_CB(bmain->armature.first);
/* lattices */
- ANIMDATA_IDS_CB(mainptr->latt.first);
+ ANIMDATA_IDS_CB(bmain->latt.first);
/* meshes */
- ANIMDATA_IDS_CB(mainptr->mesh.first);
+ ANIMDATA_IDS_CB(bmain->mesh.first);
/* particles */
- ANIMDATA_IDS_CB(mainptr->particle.first);
+ ANIMDATA_IDS_CB(bmain->particle.first);
/* speakers */
- ANIMDATA_IDS_CB(mainptr->speaker.first);
+ ANIMDATA_IDS_CB(bmain->speaker.first);
/* movie clips */
- ANIMDATA_IDS_CB(mainptr->movieclip.first);
+ ANIMDATA_IDS_CB(bmain->movieclip.first);
/* objects */
- ANIMDATA_IDS_CB(mainptr->object.first);
+ ANIMDATA_IDS_CB(bmain->object.first);
/* masks */
- ANIMDATA_IDS_CB(mainptr->mask.first);
+ ANIMDATA_IDS_CB(bmain->mask.first);
/* worlds */
- ANIMDATA_NODETREE_IDS_CB(mainptr->world.first, World);
+ ANIMDATA_NODETREE_IDS_CB(bmain->world.first, World);
/* scenes */
- ANIMDATA_NODETREE_IDS_CB(mainptr->scene.first, Scene);
+ ANIMDATA_NODETREE_IDS_CB(bmain->scene.first, Scene);
/* line styles */
- ANIMDATA_IDS_CB(mainptr->linestyle.first);
+ ANIMDATA_IDS_CB(bmain->linestyle.first);
/* grease pencil */
- ANIMDATA_IDS_CB(mainptr->gpencil.first);
+ ANIMDATA_IDS_CB(bmain->gpencil.first);
+ /* palettes */
+ ANIMDATA_IDS_CB(mainptr->palettes.first);
+
/* cache files */
- ANIMDATA_IDS_CB(mainptr->cachefiles.first);
+ ANIMDATA_IDS_CB(bmain->cachefiles.first);
}
/* Fix all RNA-Paths throughout the database (directly access the Global.main
version)
@@@ -1188,70 -1187,67 +1191,70 @@@ void BKE_animdata_fix_paths_rename_all(
} (void)0
/* nodes */
- RENAMEFIX_ANIM_IDS(mainptr->nodetree.first);
+ RENAMEFIX_ANIM_IDS(bmain->nodetree.first);
/* textures */
- RENAMEFIX_ANIM_NODETREE_IDS(mainptr->tex.first, Tex);
+ RENAMEFIX_ANIM_NODETREE_IDS(bmain->tex.first, Tex);
/* lamps */
- RENAMEFIX_ANIM_NODETREE_IDS(mainptr->lamp.first, Lamp);
+ RENAMEFIX_ANIM_NODETREE_IDS(bmain->lamp.first, Lamp);
/* materials */
- RENAMEFIX_ANIM_NODETREE_IDS(mainptr->mat.first, Material);
+ RENAMEFIX_ANIM_NODETREE_IDS(bmain->mat.first, Material);
/* cameras */
- RENAMEFIX_ANIM_IDS(mainptr->camera.first);
+ RENAMEFIX_ANIM_IDS(bmain->camera.first);
/* shapekeys */
- RENAMEFIX_ANIM_IDS(mainptr->key.first);
+ RENAMEFIX_ANIM_IDS(bmain->key.first);
/* metaballs */
- RENAMEFIX_ANIM_IDS(mainptr->mball.first);
+ RENAMEFIX_ANIM_IDS(bmain->mball.first);
/* curves */
- RENAMEFIX_ANIM_IDS(mainptr->curve.first);
+ RENAMEFIX_ANIM_IDS(bmain->curve.first);
/* armatures */
- RENAMEFIX_ANIM_IDS(mainptr->armature.first);
+ RENAMEFIX_ANIM_IDS(bmain->armature.first);
/* lattices */
- RENAMEFIX_ANIM_IDS(mainptr->latt.first);
+ RENAMEFIX_ANIM_IDS(bmain->latt.first);
/* meshes */
- RENAMEFIX_ANIM_IDS(mainptr->mesh.first);
+ RENAMEFIX_ANIM_IDS(bmain->mesh.first);
/* particles */
- RENAMEFIX_ANIM_IDS(mainptr->particle.first);
+ RENAMEFIX_ANIM_IDS(bmain->particle.first);
/* speakers */
- RENAMEFIX_ANIM_IDS(mainptr->speaker.first);
+ RENAMEFIX_ANIM_IDS(bmain->speaker.first);
/* movie clips */
- RENAMEFIX_ANIM_IDS(mainptr->movieclip.first);
+ RENAMEFIX_ANIM_IDS(bmain->movieclip.first);
/* objects */
- RENAMEFIX_ANIM_IDS(mainptr->object.first);
+ RENAMEFIX_ANIM_IDS(bmain->object.first);
/* masks */
- RENAMEFIX_ANIM_IDS(mainptr->mask.first);
+ RENAMEFIX_ANIM_IDS(bmain->mask.first);
/* worlds */
- RENAMEFIX_ANIM_NODETREE_IDS(mainptr->world.first, World);
+ RENAMEFIX_ANIM_NODETREE_IDS(bmain->world.first, World);
/* linestyles */
- RENAMEFIX_ANIM_IDS(mainptr->linestyle.first);
+ RENAMEFIX_ANIM_IDS(bmain->linestyle.first);
/* grease pencil */
- RENAMEFIX_ANIM_IDS(mainptr->gpencil.first);
+ RENAMEFIX_ANIM_IDS(bmain->gpencil.first);
+ /* palettes */
+ RENAMEFIX_ANIM_IDS(mainptr->palettes.first);
+
/* cache files */
- RENAMEFIX_ANIM_IDS(mainptr->cachefiles.first);
+ RENAMEFIX_ANIM_IDS(bmain->cachefiles.first);
/* scenes */
- RENAMEFIX_ANIM_NODETREE_IDS(mainptr->scene.first, Scene);
+ RENAMEFIX_ANIM_NODETREE_IDS(bmain->scene.first, Scene);
}
/* *********************************** */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
