diff options
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/string.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 7 |
5 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 300beae1078..6dc3c6d7bc6 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1176,7 +1176,9 @@ int object_remove_material_slot(Object *ob) totcolp = give_totcolp(ob); matarar = give_matarar(ob); - if (*matarar == NULL) return FALSE; + if (ELEM(NULL, matarar, *matarar)) { + return false; + } /* can happen on face selection in editmode */ if (ob->actcol > ob->totcol) { diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 5bd07ac8778..572b142d044 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -357,10 +357,9 @@ char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_ char *str_new; /* add what's left of the string to the assembly buffer - * - we've been adjusting str to point at the end of the replaced segments + * - we've been adjusting str to point at the end of the replaced segments */ - if (str != NULL) - BLI_dynstr_append(ds, str); + BLI_dynstr_append(ds, str); /* convert to new c-string (MEM_malloc'd), and free the buffer */ str_new = BLI_dynstr_get_cstring(ds); diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index a5e51ccf32a..014a64170db 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -239,7 +239,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, Object *ob, ListBa * - only do this if keyframes should have been added * - do not calculate unless there are paths already to update... */ - if (C && (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) { + if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) { //ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear ED_pose_recalculate_paths(scene, ob); } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 13fb46e35de..52f51cfcf48 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2049,7 +2049,7 @@ static int make_local_exec(bContext *C, wmOperator *op) if (adt) BKE_animdata_make_local(adt); /* tag indirect data direct */ - matarar = (Material ***)give_matarar(ob); + matarar = give_matarar(ob); if (matarar) { for (a = 0; a < ob->totcol; a++) { ma = (*matarar)[a]; diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index c4315c56376..59e3180172d 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -148,15 +148,16 @@ static void graph_panel_properties(const bContext *C, Panel *pa) PointerRNA fcu_ptr; uiLayout *layout = pa->layout; uiLayout *col, *row, *sub; - uiBlock *block; + // uiBlock *block; // UNUSED char name[256]; int icon = 0; if (!graph_panel_context(C, &ale, &fcu)) return; - block = uiLayoutGetBlock(layout); - /* uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL); */ + // UNUSED + // block = uiLayoutGetBlock(layout); + // uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL); /* F-Curve pointer */ RNA_pointer_create(ale->id, &RNA_FCurve, fcu, &fcu_ptr); |