Commit: 3749eac075c6ca52a13ae6c3869ecc7e95bd598f Author: Gaia Clary Date: Tue Nov 13 17:21:51 2018 +0100 Branches: collada2.8 https://developer.blender.org/rB3749eac075c6ca52a13ae6c3869ecc7e95bd598f
Merge remote-tracking branch 'origin/blender2.8' into collada2.8 =================================================================== =================================================================== diff --cc source/blender/collada/collada_utils.cpp index 3b967c85def,5019916b06f..54514da8d4a --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@@ -46,28 -44,18 +46,29 @@@ extern "C" #include "BLI_math.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BKE_action.h" #include "BKE_context.h" #include "BKE_customdata.h" +#include "BKE_constraint.h" +#include "BKE_key.h" +#include "BKE_material.h" +#include "BKE_node.h" +#include "BKE_object.h" #include "BKE_global.h" #include "BKE_layer.h" + #include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" + #include "BKE_object.h" #include "BKE_scene.h" - #include "BKE_main.h" #include "ED_armature.h" +#include "ED_screen.h" +#include "ED_node.h" + +#include "MEM_guardedalloc.h" #include "WM_api.h" // XXX hrm, see if we can do without this #include "WM_types.h" diff --cc source/blender/collada/collada_utils.h index 1cb9de027c3,001a2f5fe1b..08232ed8c36 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@@ -58,6 -49,6 +58,7 @@@ extern "C" #include "BLI_utildefines.h" #include "BLI_string.h" ++#include "BKE_main.h" #include "BKE_context.h" #include "BKE_object.h" #include "BKE_scene.h" _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs