[Bf-blender-cvs] [d6e15033da2] soc-2021-simulation-display: Fixed error with point cache
soumya pochiraju
noreply at git.blender.org
Fri Aug 6 09:42:37 CEST 2021
Commit: d6e15033da23928d4bad2914d4878f63990e0823
Author: soumya pochiraju
Date: Fri Aug 6 13:10:29 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBd6e15033da23928d4bad2914d4878f63990e0823
Fixed error with point cache
===================================================================
M source/blender/blenkernel/intern/pointcache.c
M source/blender/makesdna/DNA_rigidbody_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 09afeceec95..f640f59545e 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -3869,6 +3869,11 @@ static const char *ptcache_data_struct[] = {
"", // BPHYS_DATA_SIZE:
"", // BPHYS_DATA_TIMES:
"BoidData", // case BPHYS_DATA_BOIDS:
+ "sim_data_vec", //BPHYS_DATA_EFF_FORCES:
+ "sim_data_vec", //BPHYS_DATA_NORM_FORCES:
+ "sim_data_vec", //BPHYS_DATA_FRIC_FORCES:
+ "sim_data_vec", //BPHYS_DATA_VEC_LOCATIONS:
+ "", //BPHYS_DATA_PREV_VELOCITY:
};
static const char *ptcache_extra_struct[] = {
"",
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h
index 3ad761fd1fe..5935da037f1 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -173,9 +173,8 @@ typedef struct RigidBodyOb {
struct RigidBodyOb_Shared *shared;
/** Options for debug drawing. */
- short sim_display_options;
- short display_force_types;
- char _pad2[4];
+ int sim_display_options;
+ int display_force_types;
/** Force vectors. */
sim_data_vec eff_forces[3];
More information about the Bf-blender-cvs
mailing list