[Bf-blender-cvs] [3f97468bd4f] experimental-build: Revert "Add some dummy failing static asserts for sake of testing."
Bastien Montagne
noreply at git.blender.org
Thu Nov 23 17:31:40 CET 2017
Commit: 3f97468bd4f610706d390f973b2acc562803b30a
Author: Bastien Montagne
Date: Thu Nov 23 17:31:16 2017 +0100
Branches: experimental-build
https://developer.blender.org/rB3f97468bd4f610706d390f973b2acc562803b30a
Revert "Add some dummy failing static asserts for sake of testing."
This reverts commit c333af11bb68ca9562caf578bacbda26cdc47137.
===================================================================
M source/blender/editors/animation/anim_channels_edit.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 632c493fc3a..82f24c91df1 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -74,8 +74,6 @@
/* -------------------------- Selection ------------------------------------- */
-BLI_STATIC_ASSERT(sizeof(uint) == sizeof(double), "Size of uint is not size of double, chocking!");
-
/* Set the given animation-channel as the active one for the active context */
// TODO: extend for animdata types...
void ANIM_set_active_channel(bAnimContext *ac, void *data, eAnimCont_Types datatype, eAnimFilter_Flags filter, void *channel_data, eAnim_ChannelType channel_type)
@@ -83,8 +81,6 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, eAnimCont_Types datat
ListBase anim_data = {NULL, NULL};
bAnimListElem *ale;
- BLI_STATIC_ASSERT(sizeof(char) == sizeof(double), "Size of char is not size of double, chocking!");
-
/* try to build list of filtered items */
ANIM_animdata_filter(ac, &anim_data, filter, data, datatype);
if (BLI_listbase_is_empty(&anim_data))
@@ -95,16 +91,13 @@ void ANIM_set_active_channel(bAnimContext *ac, void *data, eAnimCont_Types datat
/* skip if types don't match */
if (channel_type != ale->type)
continue;
-
- BLI_STATIC_ASSERT(sizeof(*ac) == sizeof(double), "Size of bAnimContext is not size of double, chocking!");
-
+
/* flag to set depends on type */
switch (ale->type) {
case ANIMTYPE_GROUP:
{
bActionGroup *agrp = (bActionGroup *)ale->data;
- BLI_STATIC_ASSERT(sizeof(*agrp) == sizeof(double), "Size of bActionGroup is not size of double, chocking!");
-
+
ACHANNEL_SET_FLAG(agrp, ACHANNEL_SETFLAG_CLEAR, AGRP_ACTIVE);
break;
}
More information about the Bf-blender-cvs
mailing list