unreachable code in wm_keymap.c #41811

Closed
opened 2014-09-13 13:52:54 +02:00 by Greg Dickson · 11 comments

I could be wrong but it appears that line 1521 in the 2.71 source (1561 of the current on GIT) is unreachable in
/** \file blender/windowmanager/intern/wm_keymap.c

  • \ingroup wm
  • Configurable key-maps - add/remove/find/compare/patch...
    */
	else if (strstr(opname, "PAINT_OT")) {
		
		/* check for relevant mode */
		switch (CTX_data_mode_enum(C)) {
			case OB_MODE_WEIGHT_PAINT:
				km = WM_keymap_find_all(C, "Weight Paint", 0, 0);
				break;
			case OB_MODE_VERTEX_PAINT:
				km = WM_keymap_find_all(C, "Vertex Paint", 0, 0);
				break;
			case OB_MODE_TEXTURE_PAINT:
				km = WM_keymap_find_all(C, "Image Paint", 0, 0);
				break;
		}
	}
	/* Paint Face Mask */
	else if (strstr(opname, "PAINT_OT_face_select")) {
		km = WM_keymap_find_all(C, "Face Mask", sl->spacetype, 0);
	}

this should probably be

	/* Paint Face Mask */
	else if (strstr(opname, "PAINT_OT_face_select")) {
		km = WM_keymap_find_all(C, "Face Mask", sl->spacetype, 0);
	}
	else if (strstr(opname, "PAINT_OT")) {
		
		/* check for relevant mode */
		switch (CTX_data_mode_enum(C)) {
			case OB_MODE_WEIGHT_PAINT:
				km = WM_keymap_find_all(C, "Weight Paint", 0, 0);
				break;
			case OB_MODE_VERTEX_PAINT:
				km = WM_keymap_find_all(C, "Vertex Paint", 0, 0);
				break;
			case OB_MODE_TEXTURE_PAINT:
				km = WM_keymap_find_all(C, "Image Paint", 0, 0);
				break;
		}
	}

I could be wrong but it appears that line 1521 in the 2.71 source (1561 of the current on GIT) is unreachable in /** \file blender/windowmanager/intern/wm_keymap.c * \ingroup wm * * Configurable key-maps - add/remove/find/compare/patch... */ ``` else if (strstr(opname, "PAINT_OT")) { /* check for relevant mode */ switch (CTX_data_mode_enum(C)) { case OB_MODE_WEIGHT_PAINT: km = WM_keymap_find_all(C, "Weight Paint", 0, 0); break; case OB_MODE_VERTEX_PAINT: km = WM_keymap_find_all(C, "Vertex Paint", 0, 0); break; case OB_MODE_TEXTURE_PAINT: km = WM_keymap_find_all(C, "Image Paint", 0, 0); break; } } /* Paint Face Mask */ else if (strstr(opname, "PAINT_OT_face_select")) { km = WM_keymap_find_all(C, "Face Mask", sl->spacetype, 0); } ``` this should probably be ``` /* Paint Face Mask */ else if (strstr(opname, "PAINT_OT_face_select")) { km = WM_keymap_find_all(C, "Face Mask", sl->spacetype, 0); } else if (strstr(opname, "PAINT_OT")) { /* check for relevant mode */ switch (CTX_data_mode_enum(C)) { case OB_MODE_WEIGHT_PAINT: km = WM_keymap_find_all(C, "Weight Paint", 0, 0); break; case OB_MODE_VERTEX_PAINT: km = WM_keymap_find_all(C, "Vertex Paint", 0, 0); break; case OB_MODE_TEXTURE_PAINT: km = WM_keymap_find_all(C, "Image Paint", 0, 0); break; } } ```
Author

Changed status to: 'Open'

Changed status to: 'Open'
Author

Added subscriber: @GregDickson

Added subscriber: @GregDickson

This issue was referenced by fdb12ff564

This issue was referenced by fdb12ff564daefc20829ebe37edf76788530bef6
Bastien Montagne self-assigned this 2014-09-13 15:51:26 +02:00

Good catch, thanks! :)

Good catch, thanks! :)

Changed status from 'Open' to: 'Resolved'

Changed status from 'Open' to: 'Resolved'

Closed by commit fdb12ff564.

Closed by commit fdb12ff564.
Author

I was going to say while your in there couldn't the following work the same way.
I am still getting my head around the blender context thing

	else if (strstr(opname, "OBJECT_OT")) {
		/* exception, this needs to work outside object mode too */
		if (strstr(opname, "OBJECT_OT_mode_set"))
			km = WM_keymap_find_all(C, "Object Non-modal", 0, 0);
		else
			km = WM_keymap_find_all(C, "Object Mode", 0, 0);
	}

but may be next time your around there

I was going to say while your in there couldn't the following work the same way. I am still getting my head around the blender context thing ``` else if (strstr(opname, "OBJECT_OT")) { /* exception, this needs to work outside object mode too */ if (strstr(opname, "OBJECT_OT_mode_set")) km = WM_keymap_find_all(C, "Object Non-modal", 0, 0); else km = WM_keymap_find_all(C, "Object Mode", 0, 0); } ``` but may be next time your around there

Yes it could, but current code is working too afaik, so no real need to change it here?

Yes it could, but current code is working too afaik, so no real need to change it here?
Author

OK Cool
Thanks heaps for the quick fix.
I am trying to duplicate this in python (its not callable in anyway directly from python is it?)

OK Cool Thanks heaps for the quick fix. I am trying to duplicate this in python (its not callable in anyway directly from python is it?)

No, this is not accessible from py currently :/

No, this is not accessible from py currently :/
Author

Don't be sad :)
That's the cool thing about Blender/Python.
If you want it you can always make it. :D
Peeling the onion is the bit that makes me cry a bit.

Don't be sad :) That's the cool thing about Blender/Python. If you want it you can always make it. :D Peeling the onion is the bit that makes me cry a bit.
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#41811
No description provided.