archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-02-07 11:18:50 +11:00
parent 77b61b554c 1e4b612d6a
commit 17577c53c6
58 changed files with 91 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/object/object_add.c
View File

@@ -42,8 +42,8 @@
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meta_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_force.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_lightprobe_types.h"
#include "DNA_scene_types.h"

2
source/blender/editors/object/object_edit.c
View File

@@ -54,7 +54,7 @@
#include "DNA_property_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_vfont_types.h"
#include "DNA_mesh_types.h"

2
source/blender/editors/object/object_modifier.c
View File

@@ -40,7 +40,7 @@
#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "BLI_bitmap.h"