archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove unneeded NULL checks, add one for give_matarar() return value.

Browse Source
This commit is contained in:
Campbell Barton
2013-07-28 06:37:58 +00:00
parent 0cb9a83113
commit c4a50e9aeb
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/material.c
View File

@@ -1176,7 +1176,9 @@ int object_remove_material_slot(Object *ob)
totcolp = give_totcolp(ob); totcolp = give_totcolp(ob);
matarar = give_matarar(ob); matarar = give_matarar(ob);
if (*matarar == NULL) return FALSE; if (ELEM(NULL, matarar, *matarar)) {
return false;
}
/* can happen on face selection in editmode */ /* can happen on face selection in editmode */
if (ob->actcol > ob->totcol) { if (ob->actcol > ob->totcol) {

5
source/blender/blenlib/intern/string.c
View File

@@ -357,10 +357,9 @@ char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_
char *str_new; char *str_new;
/* add what's left of the string to the assembly buffer /* 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 */ /* convert to new c-string (MEM_malloc'd), and free the buffer */
str_new = BLI_dynstr_get_cstring(ds); str_new = BLI_dynstr_get_cstring(ds);

2
source/blender/editors/armature/pose_utils.c
View File

@@ -239,7 +239,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, Object *ob, ListBa
* - only do this if keyframes should have been added * - only do this if keyframes should have been added
* - do not calculate unless there are paths already to update... * - 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_clear_paths(C, ob); // XXX for now, don't need to clear
ED_pose_recalculate_paths(scene, ob); ED_pose_recalculate_paths(scene, ob);
} }

2
source/blender/editors/object/object_relations.c
View File

@@ -2049,7 +2049,7 @@ static int make_local_exec(bContext *C, wmOperator *op)
if (adt) BKE_animdata_make_local(adt); if (adt) BKE_animdata_make_local(adt);
/* tag indirect data direct */ /* tag indirect data direct */
matarar = (Material ***)give_matarar(ob); matarar = give_matarar(ob);
if (matarar) { if (matarar) {
for (a = 0; a < ob->totcol; a++) { for (a = 0; a < ob->totcol; a++) {
ma = (*matarar)[a]; ma = (*matarar)[a];

7
source/blender/editors/space_graph/graph_buttons.c
View File

@@ -148,15 +148,16 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
PointerRNA fcu_ptr; PointerRNA fcu_ptr;
uiLayout *layout = pa->layout; uiLayout *layout = pa->layout;
uiLayout *col, *row, *sub; uiLayout *col, *row, *sub;
uiBlock *block; // uiBlock *block; // UNUSED
char name[256]; char name[256];
int icon = 0; int icon = 0;
if (!graph_panel_context(C, &ale, &fcu)) if (!graph_panel_context(C, &ale, &fcu))
return; return;
block = uiLayoutGetBlock(layout); // UNUSED
/* uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL); */ // block = uiLayoutGetBlock(layout);
// uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL);
/* F-Curve pointer */ /* F-Curve pointer */
RNA_pointer_create(ale->id, &RNA_FCurve, fcu, &fcu_ptr); RNA_pointer_create(ale->id, &RNA_FCurve, fcu, &fcu_ptr);