forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
17577c53c6
2
intern/elbeem/extern/elbeem.h
vendored
2
intern/elbeem/extern/elbeem.h
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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
2
source/blender/makesdna/DNA_object_fluidsim.h → source/blender/makesdna/DNA_object_fluidsim_types.h
@ -25,7 +25,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file DNA_object_fluidsim.h
|
||||
/** \file DNA_object_fluidsim_types.h
|
||||
* \ingroup DNA
|
||||
*/
|
||||
|
@ -25,7 +25,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file DNA_object_force.h
|
||||
/** \file DNA_object_force_types.h
|
||||
* \ingroup DNA
|
||||
*/
|
||||
|
@ -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 */
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user