Commit: 7990105407bc97a1c5a7302ddc0ee36d8d9e9ae0
Author: Brecht Van Lommel
Date: Wed Feb 28 02:51:45 2018 +0100
Branches: master
https://developer.blender.org/rB7990105407bc97a1c5a7302ddc0ee36d8d9e9ae0
Code cleanup: fix a few compiler warnings.
===================================================================
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 8ebf7424c42..755b10c3f1d 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -166,7 +166,7 @@ string ComponentDepsNode::identifier() const
OperationDepsNode *ComponentDepsNode::find_operation(OperationIDKey key) const
{
- OperationDepsNode *node;
+ OperationDepsNode *node = NULL;
if (operations_map != NULL) {
node = (OperationDepsNode *)BLI_ghash_lookup(operations_map,
&key);
}
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 2d002a38a19..35e8046313a 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -2082,7 +2082,7 @@ static int viewzoom_modal(bContext *C, wmOperator *op,
const wmEvent *event)
viewzoom_apply(
vod, &event->x, U.viewzoom,
(U.uiflag & USER_ZOOM_INVERT) != 0,
- (use_mouse_init && (U.uiflag & USER_ZOOM_TO_MOUSEPOS))
? vod->prev.event_xy : NULL);
+ (use_mouse_init && (U.uiflag & USER_ZOOM_TO_MOUSEPOS)));
if (ED_screen_animation_playing(CTX_wm_manager(C))) {
use_autokey = true;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
