bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

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

2
intern/elbeem/extern/elbeem.h vendored
View File

@ -106,7 +106,7 @@ typedef struct elbeemSimulationSettings {
// defines for elbeemMesh->type below
/* please keep in sync with DNA_object_fluidsim.h */
/* please keep in sync with DNA_object_fluidsim_types.h */
#define OB_FLUIDSIM_FLUID 4
#define OB_FLUIDSIM_OBSTACLE 8
#define OB_FLUIDSIM_INFLOW 16

4
source/blender/CMakeLists.txt
View File

@ -65,8 +65,8 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h

2
source/blender/alembic/intern/abc_mesh.cc
View File

@ -31,7 +31,7 @@ extern "C" {
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "BLI_math_geom.h"

4
source/blender/blenkernel/BKE_pointcache.h
View File

@ -34,7 +34,7 @@
#include "DNA_ID.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_boid_types.h"
#include <stdio.h> /* for FILE */
@ -141,7 +141,7 @@ typedef struct PTCacheID {
unsigned int default_step;
unsigned int max_step;
/* flags defined in DNA_object_force.h */
/* flags defined in DNA_object_force_types.h */
unsigned int data_types, info_types;
/* copies point data to cache data */

2
source/blender/blenkernel/intern/boids.c
View File

@ -35,7 +35,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "BLI_rand.h"

4
source/blender/blenkernel/intern/bpath.c
View File

@ -53,8 +53,8 @@
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_movieclip_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_particle_types.h"
#include "DNA_sequence_types.h"

2
source/blender/blenkernel/intern/bullet.c
View File

@ -33,7 +33,7 @@
#include "MEM_guardedalloc.h"
/* types */
#include "DNA_object_force.h" /* here is the softbody struct */
#include "DNA_object_force_types.h" /* here is the softbody struct */
#include "BKE_bullet.h"

2
source/blender/blenkernel/intern/collision.c
View File

@ -36,7 +36,7 @@
#include "DNA_effect_types.h"
#include "DNA_group_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "DNA_meshdata_types.h"

2
source/blender/blenkernel/intern/effect.c
View File

@ -42,7 +42,7 @@
#include "DNA_listBase.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_texture_types.h"
#include "DNA_scene_types.h"

4
source/blender/blenkernel/intern/fluidsim.c
View File

@ -40,8 +40,8 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_force.h" // for pointcache
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_force_types.h" // for pointcache
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"

2
source/blender/blenkernel/intern/library_query.c
View File

@ -51,7 +51,7 @@
#include "DNA_movieclip_types.h"
#include "DNA_mask_types.h"
#include "DNA_node_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_lightprobe_types.h"
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"

2
source/blender/blenkernel/intern/object_deform.c
View File

@ -42,7 +42,7 @@
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"

4
source/blender/blenkernel/intern/particle_system.c
View File

@ -48,7 +48,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_curve_types.h"
#include "DNA_scene_types.h"
@ -98,7 +98,7 @@
/* fluid sim particle import */
#ifdef WITH_MOD_FLUID
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>

2
source/blender/blenkernel/intern/pointcache.c
View File

@ -40,7 +40,7 @@
#include "DNA_dynamicpaint_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"

2
source/blender/blenkernel/intern/rigidbody.c
View File

@ -50,7 +50,7 @@
#include "DNA_group_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"

2
source/blender/blenloader/intern/readfile.c
View File

@ -86,7 +86,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_nla_types.h"
#include "DNA_node_types.h"
#include "DNA_object_fluidsim.h" // NT
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_particle_types.h"

2
source/blender/blenloader/intern/versioning_250.c
View File

@ -52,7 +52,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_node_types.h"
#include "DNA_object_fluidsim.h" // NT
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "DNA_view3d_types.h"
#include "DNA_screen_types.h"

2
source/blender/blenloader/intern/versioning_260.c
View File

@ -41,7 +41,7 @@
#include "DNA_linestyle_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim.h" // NT
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "DNA_property_types.h"
#include "DNA_text_types.h"

2
source/blender/blenloader/intern/versioning_270.c
View File

@ -45,7 +45,7 @@
#include "DNA_sequence_types.h"
#include "DNA_space_types.h"
#include "DNA_screen_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_mask_types.h"
#include "DNA_mesh_types.h"

2
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -58,7 +58,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_nla_types.h"
#include "DNA_node_types.h"
#include "DNA_object_fluidsim.h" // NT
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "DNA_property_types.h"
#include "DNA_view3d_types.h"

2
source/blender/blenloader/intern/writefile.c
View File

@ -132,7 +132,7 @@
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_particle_types.h"
#include "DNA_lightprobe_types.h"

3
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -67,7 +67,7 @@ extern "C" {
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"
#include "DNA_world_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "BKE_action.h"
#include "BKE_armature.h"
@ -194,7 +194,6 @@ static bool particle_system_depends_on_time(ParticleSystem *psys)
static bool object_particles_depends_on_time(Object *object)
{
return true;
BLI_LISTBASE_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
if (particle_system_depends_on_time(psys)) {
return true;

2
source/blender/depsgraph/intern/depsgraph_build.cc
View File

@ -47,7 +47,7 @@ extern "C" {
#include "DNA_cachefile_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "BKE_main.h"
#include "BKE_collision.h"

2
source/blender/draw/engines/eevee/eevee_depth_of_field.c
View File

@ -32,7 +32,7 @@
#include "DNA_anim_types.h"
#include "DNA_camera_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"

2
source/blender/draw/engines/eevee/eevee_volumes.c
View File

@ -30,7 +30,7 @@
#include "BLI_rand.h"
#include "BLI_string_utils.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_smoke_types.h"
#include "DNA_world_types.h"

2
source/blender/draw/modes/object_mode.c
View File

@ -32,7 +32,7 @@
#include "DNA_curve_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meta_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_lightprobe_types.h"
#include "DNA_particle_types.h"
#include "DNA_view3d_types.h"

2
source/blender/editors/interface/interface_templates.c
View File

@ -36,7 +36,7 @@
#include "DNA_node_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_brush_types.h"
#include "DNA_texture_types.h"

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"

2
source/blender/editors/physics/physics_fluid.c
View File

@ -39,7 +39,7 @@
/* types */
#include "DNA_action_types.h"
#include "DNA_object_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"

2
source/blender/editors/space_buttons/buttons_texture.c
View File

@ -45,7 +45,7 @@
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"

2
source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
View File

@ -31,7 +31,7 @@
#include "BKE_object.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "ED_screen.h"
#include "ED_manipulator_library.h"

6
source/blender/makesdna/DNA_modifier_types.h
View File

@ -603,7 +603,7 @@ typedef struct ClothModifierData {
struct Cloth *clothObject; /* The internal data structure for cloth. */
struct ClothSimSettings *sim_parms; /* definition is in DNA_cloth_types.h */
struct ClothCollSettings *coll_parms; /* definition is in DNA_cloth_types.h */
struct PointCache *point_cache; /* definition is in DNA_object_force.h */
struct PointCache *point_cache; /* definition is in DNA_object_force_types.h */
struct ListBase ptcaches;
/* XXX nasty hack, remove once hair can be separated from cloth modifier data */
struct ClothHairData *hairdata;
@ -800,8 +800,8 @@ typedef enum {
typedef struct FluidsimModifierData {
ModifierData modifier;
struct FluidsimSettings *fss; /* definition is in DNA_object_fluidsim.h */
struct PointCache *point_cache; /* definition is in DNA_object_force.h */
struct FluidsimSettings *fss; /* definition is in DNA_object_fluidsim_types.h */
struct PointCache *point_cache; /* definition is in DNA_object_force_types.h */
} FluidsimModifierData;
typedef struct ShrinkwrapModifierData {

2
source/blender/makesdna/DNA_object_fluidsim.h → source/blender/makesdna/DNA_object_fluidsim_types.h
View File

@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file DNA_object_fluidsim.h
/** \file DNA_object_fluidsim_types.h
* \ingroup DNA
*/

2
source/blender/makesdna/DNA_object_force.h → source/blender/makesdna/DNA_object_force_types.h
View File

@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file DNA_object_force.h
/** \file DNA_object_force_types.h
* \ingroup DNA
*/

2
source/blender/makesdna/DNA_smoke_types.h
View File

@ -189,7 +189,7 @@ typedef struct SmokeDomainSettings {
char pad[2];
/* Smoke uses only one cache from now on (index [0]), but keeping the array for now for reading old files. */
struct PointCache *point_cache[2]; /* definition is in DNA_object_force.h */
struct PointCache *point_cache[2]; /* definition is in DNA_object_force_types.h */
struct ListBase ptcaches[2];
struct EffectorWeights *effector_weights;
int border_collisions; /* How domain border collisions are handled */

8
source/blender/makesdna/intern/makesdna.c
View File

@ -86,8 +86,8 @@ static const char *includefiles[] = {
"DNA_modifier_types.h",
"DNA_lattice_types.h",
"DNA_object_types.h",
"DNA_object_force.h",
"DNA_object_fluidsim.h",
"DNA_object_force_types.h",
"DNA_object_fluidsim_types.h",
"DNA_world_types.h",
"DNA_scene_types.h",
"DNA_view3d_types.h",
@ -1313,8 +1313,8 @@ int main(int argc, char **argv)
#include "DNA_modifier_types.h"
#include "DNA_lattice_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_force_types.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_world_types.h"
#include "DNA_scene_types.h"
#include "DNA_view3d_types.h"

2
source/blender/makesrna/intern/rna_dynamicpaint.c
View File

@ -34,7 +34,7 @@
#include "DNA_dynamicpaint_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

2
source/blender/makesrna/intern/rna_fluidsim.c
View File

@ -26,7 +26,7 @@
#include <stdlib.h>
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "BLI_threads.h"
#include "BLI_utildefines.h"

2
source/blender/makesrna/intern/rna_modifier.c
View File

@ -34,7 +34,7 @@
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "MEM_guardedalloc.h"

2
source/blender/makesrna/intern/rna_object.c
View File

@ -33,7 +33,7 @@
#include "DNA_group_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_property_types.h"
#include "DNA_scene_types.h"

2
source/blender/makesrna/intern/rna_object_force.c
View File

@ -28,7 +28,7 @@
#include "DNA_cloth_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_smoke_types.h"

2
source/blender/makesrna/intern/rna_particle.c
View File

@ -36,7 +36,7 @@
#include "DNA_modifier_types.h"
#include "DNA_cloth_types.h"
#include "DNA_particle_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_boid_types.h"

2
source/blender/makesrna/intern/rna_smoke.c
View File

@ -42,7 +42,7 @@
#include "BKE_pointcache.h"
#include "DNA_modifier_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_smoke_types.h"

2
source/blender/modifiers/intern/MOD_dynamicpaint.c
View File

@ -29,7 +29,7 @@
#include "DNA_dynamicpaint_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"

2
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@ -34,7 +34,7 @@
#include "DNA_scene_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h"
#include "BLI_utildefines.h"

2
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@ -40,7 +40,7 @@
#include "DNA_scene_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"

2
source/blender/modifiers/intern/MOD_smoke.c
View File

@ -41,7 +41,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_smoke_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "BLI_utildefines.h"

2
source/blender/modifiers/intern/MOD_softbody.c
View File

@ -35,7 +35,7 @@
#include <stdio.h>
#include "DNA_scene_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "BLI_utildefines.h"

2
source/blender/physics/intern/BPH_mass_spring.cpp
View File

@ -34,7 +34,7 @@ extern "C" {
#include "DNA_cloth_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"

2
source/blender/physics/intern/implicit_blender.c
View File

@ -37,7 +37,7 @@
#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_texture_types.h"

2
source/blender/physics/intern/implicit_eigen.cpp
View File

@ -73,7 +73,7 @@
extern "C" {
#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_texture_types.h"

2
source/blender/render/intern/source/convertblender.c
View File

@ -56,7 +56,7 @@
#include "DNA_modifier_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_object_fluidsim.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"

23
source/blender/render/intern/source/pipeline.c
View File

@ -41,6 +41,7 @@
#include "DNA_image_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
#include "DNA_userdef_types.h"
@ -2104,6 +2105,28 @@ static void tag_dependend_objects_for_render(Scene *scene, int UNUSED(renderlay)
DEG_id_tag_update(&smd->target->id, OB_RECALC_DATA);
}
}
else if (md->type == eModifierType_ParticleSystem) {
ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md;
ParticleSystem *psys = psmd->psys;
ParticleSettings *part = psys->part;
switch (part->ren_as) {
case PART_DRAW_OB:
if (part->dup_ob != NULL) {
DEG_id_tag_update(&part->dup_ob->id, OB_RECALC_DATA);
}
break;
case PART_DRAW_GR:
if (part->dup_group != NULL) {
for (GroupObject *go = part->dup_group->gobject.first;
go != NULL;
go = go->next)
{
DEG_id_tag_update(&go->ob->id, OB_RECALC_DATA);
}
}
break;
}
}
}
}
}

2
source/blender/render/intern/source/voxeldata.c
View File

@ -61,7 +61,7 @@
#include "BPH_mass_spring.h"
#include "DNA_texture_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "DNA_modifier_types.h"

2
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -132,7 +132,7 @@
#include "DNA_key_types.h"
#include "DNA_armature_types.h"
#include "DNA_action_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
#include "DNA_constraint_types.h"
#include "MEM_guardedalloc.h"

2
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -49,7 +49,7 @@ subject to the following restrictions:
#include "DNA_scene_types.h"
#include "DNA_world_types.h"
#include "DNA_object_force.h"
#include "DNA_object_force_types.h"
extern "C" {
#include "BLI_utildefines.h"