[Bf-blender-cvs] [2bb4961] soc-2016-layer_manager: Quiet compiler warning
Julian Eisel
noreply at git.blender.org
Tue Sep 20 00:40:51 CEST 2016
Commit: 2bb49618a8d7ada4567a05ce61c46b3f2907279a
Author: Julian Eisel
Date: Tue Sep 20 00:40:23 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB2bb49618a8d7ada4567a05ce61c46b3f2907279a
Quiet compiler warning
===================================================================
M source/blender/editors/space_outliner/outliner_tools.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 7655606..e0a0f9b 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -819,7 +819,7 @@ static void outliner_do_data_operation(SpaceOops *soops, int type, int event, Li
static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *scene, Base *base)
{
- Base *base_next;
+ Base *base_next = NULL;
Object *parent;
if (!base) {
@@ -838,7 +838,9 @@ static Base *outline_delete_hierarchy(bContext *C, ReportList *reports, Scene *s
}
BKE_BASES_ITER_END;
- base_next = BKE_objectlayer_base_next_find(base_next, false);
+ if (base_next) {
+ base_next = BKE_objectlayer_base_next_find(base_next, false);
+ }
Main *bmain = CTX_data_main(C);
if (base->object->id.tag & LIB_TAG_INDIRECT) {
More information about the Bf-blender-cvs
mailing list