nrupsis/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

me-main #1

Merged
Nate Rupsis merged 123 commits from me-main into main 2023-02-13 18:39:11 +01:00
Conversation 0 Commits 123 Files Changed 969 +31 -19
8 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48d9363fa7 - Show all commits

2
source/blender/blenkernel/BKE_fcurve.h
View File

@ -63,7 +63,7 @@ typedef struct FModifierTypeInfo {
/** #eFMI_Action_Types. */
short acttype;
/** #eFMI_Requirement_Flags. */
short requires;
short requires_flag;
/** name of modifier in interface. */
char name[64];
/** name of struct for SDNA. */

18
source/blender/blenkernel/intern/fmodifier.c
View File

@ -64,7 +64,7 @@ static FModifierTypeInfo FMI_MODNAME = {
/*type*/ FMODIFIER_TYPE_MODNAME,
/*size*/ sizeof(FMod_ModName),
/*acttype*/ FMI_TYPE_SOME_ACTION,
/*requires*/ FMI_REQUIRES_SOME_REQUIREMENT,
/*requires_flag*/ FMI_REQUIRES_SOME_REQUIREMENT,
/*name*/ "Modifier Name",
/*structName*/ "FMod_ModName",
/*storage_size*/ 0,
@ -228,7 +228,7 @@ static FModifierTypeInfo FMI_GENERATOR = {
/*type*/ FMODIFIER_TYPE_GENERATOR,
/*size*/ sizeof(FMod_Generator),
/*acttype*/ FMI_TYPE_GENERATE_CURVE,
/*requires*/ FMI_REQUIRES_NOTHING,
/*requires_flag*/ FMI_REQUIRES_NOTHING,
/*name*/ N_("Generator"),
/*structName*/ "FMod_Generator",
/*storage_size*/ 0,
@ -358,7 +358,7 @@ static FModifierTypeInfo FMI_FN_GENERATOR = {
/*type*/ FMODIFIER_TYPE_FN_GENERATOR,
/*size*/ sizeof(FMod_FunctionGenerator),
/*acttype*/ FMI_TYPE_GENERATE_CURVE,
/*requires*/ FMI_REQUIRES_NOTHING,
/*requires_flag*/ FMI_REQUIRES_NOTHING,
/*name*/ N_("Built-In Function"),
/*structName*/ "FMod_FunctionGenerator",
/*storage_size*/ 0,
@ -471,7 +471,7 @@ static FModifierTypeInfo FMI_ENVELOPE = {
/*type*/ FMODIFIER_TYPE_ENVELOPE,
/*size*/ sizeof(FMod_Envelope),
/*acttype*/ FMI_TYPE_REPLACE_VALUES,
/*requires*/ 0,
/*requires_flag*/ 0,
/*name*/ N_("Envelope"),
/*structName*/ "FMod_Envelope",
/*storage_size*/ 0,
@ -770,7 +770,7 @@ static FModifierTypeInfo FMI_CYCLES = {
/*type*/ FMODIFIER_TYPE_CYCLES,
/*size*/ sizeof(FMod_Cycles),
/*acttype*/ FMI_TYPE_EXTRAPOLATION,
/*requires*/ FMI_REQUIRES_ORIGINAL_DATA,
/*requires_flag*/ FMI_REQUIRES_ORIGINAL_DATA,
/*name*/ CTX_N_(BLT_I18NCONTEXT_ID_ACTION, "Cycles"),
/*structName*/ "FMod_Cycles",
/*storage_size*/ sizeof(tFCMED_Cycles),
@ -832,7 +832,7 @@ static FModifierTypeInfo FMI_NOISE = {
/*type*/ FMODIFIER_TYPE_NOISE,
/*size*/ sizeof(FMod_Noise),
/*acttype*/ FMI_TYPE_REPLACE_VALUES,
/*requires*/ 0,
/*requires_flag*/ 0,
/*name*/ N_("Noise"),
/*structName*/ "FMod_Noise",
/*storage_size*/ 0,
@ -890,7 +890,7 @@ static FModifierTypeInfo FMI_PYTHON = {
/*type*/ FMODIFIER_TYPE_PYTHON,
/*size*/ sizeof(FMod_Python),
/*acttype*/ FMI_TYPE_GENERATE_CURVE,
/*requires*/ FMI_REQUIRES_RUNTIME_CHECK,
/*requires_flag*/ FMI_REQUIRES_RUNTIME_CHECK,
/*name*/ N_("Python"),
/*structName*/ "FMod_Python",
/*storage_size*/ 0,
@ -945,7 +945,7 @@ static FModifierTypeInfo FMI_LIMITS = {
/*type*/ FMODIFIER_TYPE_LIMITS,
/*size*/ sizeof(FMod_Limits),
/*acttype*/ FMI_TYPE_GENERATE_CURVE,
/*requires*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */
/*requires_flag*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */
/*name*/ N_("Limits"),
/*structName*/ "FMod_Limits",
/*storage_size*/ 0,
@ -1005,7 +1005,7 @@ static FModifierTypeInfo FMI_STEPPED = {
/*type*/ FMODIFIER_TYPE_STEPPED,
/*size*/ sizeof(FMod_Limits),
/*acttype*/ FMI_TYPE_GENERATE_CURVE,
/*requires*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */
/*requires_flag*/ FMI_REQUIRES_RUNTIME_CHECK, /* XXX... err... */
/*name*/ N_("Stepped"),
/*structName*/ "FMod_Stepped",
/*storage_size*/ 0,

2
source/blender/blenlib/intern/lazy_threading.cc
View File

@ -12,7 +12,7 @@ namespace blender::lazy_threading {
* deadlocks.
*/
using HintReceivers = RawStack<RawVector<FunctionRef<void()>, 0>, 0>;
thread_local HintReceivers hint_receivers = []() {
static thread_local HintReceivers hint_receivers = []() {
HintReceivers receivers;
/* Make sure there is always at least one vector. */
receivers.push_as();

4
source/blender/editors/animation/fmodifier_ui.c
View File

@ -103,7 +103,7 @@ static void fmodifier_reorder(bContext *C, Panel *panel, int new_index)
const FModifierTypeInfo *fmi = get_fmodifier_typeinfo(fcm->type);
/* Cycles modifier has to be the first, so make sure it's kept that way. */
if (fmi->requires & FMI_REQUIRES_ORIGINAL_DATA) {
if (fmi->requires_flag & FMI_REQUIRES_ORIGINAL_DATA) {
WM_report(RPT_ERROR, "Modifier requires original data");
return;
}
@ -113,7 +113,7 @@ static void fmodifier_reorder(bContext *C, Panel *panel, int new_index)
/* Again, make sure we don't move a modifier before a cycles modifier. */
FModifier *fcm_first = modifiers->first;
const FModifierTypeInfo *fmi_first = get_fmodifier_typeinfo(fcm_first->type);
if (fmi_first->requires & FMI_REQUIRES_ORIGINAL_DATA && new_index == 0) {
if (fmi_first->requires_flag & FMI_REQUIRES_ORIGINAL_DATA && new_index == 0) {
WM_report(RPT_ERROR, "Modifier requires original data");
return;
}

7
source/blender/editors/asset/ED_asset_handle.h
View File

@ -25,8 +25,11 @@ struct AssetMetaData *ED_asset_handle_get_metadata(const struct AssetHandle *ass
struct ID *ED_asset_handle_get_local_id(const struct AssetHandle *asset);
ID_Type ED_asset_handle_get_id_type(const struct AssetHandle *asset);
int ED_asset_handle_get_preview_icon_id(const struct AssetHandle *asset);
void ED_asset_handle_get_full_library_path(const struct AssetHandle *asset,
char r_full_lib_path[]);
void ED_asset_handle_get_full_library_path(
const struct AssetHandle *asset,
/* `1090` for #FILE_MAX_LIBEXTRA,
* rely on warnings to let us know if this gets out of sync. */
char r_full_lib_path[1090]);
#ifdef __cplusplus
}

8
source/blender/imbuf/intern/iris.c
View File

@ -205,9 +205,11 @@ static void test_endian_zbuf(struct ImBuf *ibuf)
int len;
int *zval;
if (BIG_LONG(1) == 1) {
return;
}
/* `BIG_LONG(1) == 1`, no change needed. */
#ifdef __BIG_ENDIAN__
return;
#endif
if (ibuf->zbuf == NULL) {
return;
}

6
source/creator/creator.c
View File

@ -584,9 +584,13 @@ int main(int argc,
}
WM_main(C);
}
#endif /* WITH_PYTHON_MODULE */
/* Neither #WM_exit, #WM_main return, this quiets CLANG's `unreachable-code-return` warning. */
BLI_assert_unreachable();
#endif /* !WITH_PYTHON_MODULE */
return 0;
} /* End of `int main(...)` function. */
#ifdef WITH_PYTHON_MODULE

3
source/creator/creator_args.c
View File

@ -478,6 +478,7 @@ static int arg_handle_print_version(int UNUSED(argc),
{
print_version_full();
exit(0);
BLI_assert_unreachable();
return 0;
}
@ -684,6 +685,7 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
# endif
exit(0);
BLI_assert_unreachable();
return 0;
}
@ -1236,6 +1238,7 @@ static int arg_handle_env_system_set(int argc, const char **argv, void *UNUSED(d
if (argc < 2) {
fprintf(stderr, "%s requires one argument\n", argv[0]);
exit(1);
BLI_assert_unreachable();
}
for (; *ch_src; ch_src++, ch_dst++) {