[Bf-blender-cvs] [bc460347524] blender2.8: Cleanup: fix compiler warnings.
Brecht Van Lommel
noreply at git.blender.org
Tue May 22 14:18:08 CEST 2018
Commit: bc46034752454314673ac0b38ae050fd3b4ae502
Author: Brecht Van Lommel
Date: Tue May 22 10:54:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbc46034752454314673ac0b38ae050fd3b4ae502
Cleanup: fix compiler warnings.
===================================================================
M source/blender/gpu/intern/gpu_texture.c
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 5c8edfb2a33..9bd4bbd89e9 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -886,6 +886,7 @@ GPUTexture *GPU_texture_create_from_vertbuf(Gwn_VertBuf *vert)
break;
default:
BLI_assert(0);
+ return NULL;
}
return GPU_texture_create_buffer(data_type, vert->vbo_id);
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 2c81d28e61f..c616d143b69 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -404,7 +404,7 @@ void WM_toolsystem_refresh_screen_area(WorkSpace *workspace, Scene *scene, ScrAr
sa->runtime.is_tool_set = true;
const int mode = WM_toolsystem_mode_from_spacetype(workspace, scene, sa, sa->spacetype);
for (bToolRef *tref = workspace->tools.first; tref; tref = tref->next) {
- if ((tref->space_type == sa->spacetype)) {
+ if (tref->space_type == sa->spacetype) {
if (tref->mode == mode) {
sa->runtime.tool = tref;
break;
More information about the Bf-blender-cvs
mailing list