[Bf-blender-cvs] [b94c7562cdb] soc-2019-adaptive-cloth: Merge branch 'master' into soc-2019-adaptive-cloth
ishbosamiya
noreply at git.blender.org
Tue Jul 9 16:28:26 CEST 2019
Commit: b94c7562cdb90b3e3bf6c85e431f20ddd50c1afd
Author: ishbosamiya
Date: Tue Jul 9 19:50:27 2019 +0530
Branches: soc-2019-adaptive-cloth
https://developer.blender.org/rBb94c7562cdb90b3e3bf6c85e431f20ddd50c1afd
Merge branch 'master' into soc-2019-adaptive-cloth
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_physics_cloth.py
index 26f943c4517,40f7cfca263..658df38c6c7
--- a/release/scripts/startup/bl_ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@@ -23,8 -23,8 +23,8 @@@ from bpy.types import
)
from bl_ui.utils import PresetPanel
- from .properties_physics_common import (
- #point_cache_ui,
+ from bl_ui.properties_physics_common import (
- point_cache_ui,
++ #point_cache_ui,
effector_weights_ui,
)
diff --cc source/blender/blenkernel/BKE_cloth.h
index 4d5df6591e5,43df78c33e4..4cfe2b3c9d7
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@@ -206,17 -187,22 +206,24 @@@ typedef struct ClothSpring
/* SIMULATION FLAGS: goal flags,.. */
/* These are the bits used in SimSettings.flags. */
typedef enum {
- CLOTH_SIMSETTINGS_FLAG_COLLOBJ =
- (1 << 2), // object is only collision object, no cloth simulation is done
- CLOTH_SIMSETTINGS_FLAG_GOAL = (1 << 3), /* DEPRECATED, for versioning only. */
- CLOTH_SIMSETTINGS_FLAG_TEARING = (1 << 4), // true if tearing is enabled
- CLOTH_SIMSETTINGS_FLAG_SCALING = (1 << 8), /* DEPRECATED, for versioning only. */
- CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12), /* edit cache in editmode */
- CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13), /* don't allow spring compression */
- CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14), /* pull ends of loose edges together */
- CLOTH_SIMSETTINGS_FLAG_DYNAMIC_BASEMESH =
- (1 << 15), /* make simulation respect deformations in the base object */
- CLOTH_SIMSETTINGS_FLAG_ADAPTIVE_REMESHING = (1 << 16), /* if true, use adaptive remeshing */
+ /** Object is only collision object, no cloth simulation is done. */
+ CLOTH_SIMSETTINGS_FLAG_COLLOBJ = (1 << 2),
+ /** DEPRECATED, for versioning only. */
+ CLOTH_SIMSETTINGS_FLAG_GOAL = (1 << 3),
+ /** True if tearing is enabled. */
+ CLOTH_SIMSETTINGS_FLAG_TEARING = (1 << 4),
+ /** DEPRECATED, for versioning only. */
+ CLOTH_SIMSETTINGS_FLAG_SCALING = (1 << 8),
+ /** Edit cache in edit-mode. */
+ CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12),
+ /** Don't allow spring compression. */
+ CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13),
+ /** Pull ends of loose edges together. */
+ CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14),
+ /** Make simulation respect deformations in the base object. */
+ CLOTH_SIMSETTINGS_FLAG_DYNAMIC_BASEMESH = (1 << 15),
++ /** if true, use adaptive remeshing */
++ CLOTH_SIMSETTINGS_FLAG_ADAPTIVE_REMESHING = (1 << 16),
} CLOTH_SIMSETTINGS_FLAGS;
/* ClothSimSettings.bending_model. */
More information about the Bf-blender-cvs
mailing list