[Bf-blender-cvs] [f82df13492b] soc-2021-simulation-display: Fixed error in python UI code, and error in caching acceleration.

soumya pochiraju noreply at git.blender.org
Fri Aug 6 09:42:37 CEST 2021


Commit: f82df13492b3591e06f1ed96e44a6b60a025f1b5
Author: soumya pochiraju
Date:   Thu Aug 5 09:10:16 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBf82df13492b3591e06f1ed96e44a6b60a025f1b5

Fixed error in python UI code, and error in caching acceleration.

===================================================================

M	release/scripts/startup/bl_ui/properties_physics_rigidbody.py
M	source/blender/makesdna/DNA_pointcache_types.h

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
index ad0b6d38523..967acea6ec6 100644
--- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
@@ -319,7 +319,7 @@ class PHYSICS_PT_rigid_body_display_options(PHYSICS_PT_rigidbody_panel, Panel):
             rigid_body_warning(layout, "Object does not have a Rigid Body")
             return
 
-        if rbo.type == ACTIVE
+        if rbo.type == 'ACTIVE':
           col = layout.column()
           col.prop(rbo, "display_data_text")
           col.prop(rbo, "display_acceleration")
diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h
index a4e03569b77..bae1a1cfaf1 100644
--- a/source/blender/makesdna/DNA_pointcache_types.h
+++ b/source/blender/makesdna/DNA_pointcache_types.h
@@ -68,7 +68,7 @@ typedef struct PTCacheMem {
   unsigned int data_types, flag;
 
   /** BPHYS_TOT_DATA. */
-  void *data[12];
+  void *data[13];
 
   struct ListBase extradata;
 } PTCacheMem;



More information about the Bf-blender-cvs mailing list