griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix [#34920] Hit Spacebar, search for freestyle, click Move Freestyle Module - crash

Browse Source 
Simply add a poll func to (re)move freestyle module ops, to check whether we actually have an active module in context.
This commit is contained in:
Bastien Montagne
2013-04-08 07:07:10 +00:00
parent a4520320ef
commit babdd90e2e
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/render/render_shading.c
View File

@@ -586,6 +586,14 @@ void SCENE_OT_render_layer_remove(wmOperatorType *ot)
#ifdef WITH_FREESTYLE
static int freestyle_active_module_poll(bContext *C)
{
PointerRNA ptr = CTX_data_pointer_get_type(C, "freestyle_module", &RNA_FreestyleModuleSettings);
FreestyleModuleConfig *module = ptr.data;
return module != NULL;
}
static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op))
{
Scene *scene = CTX_data_scene(C);
@@ -634,6 +642,7 @@ void SCENE_OT_freestyle_module_remove(wmOperatorType *ot)
ot->description = "Remove the style module from the stack";
/* api callbacks */
ot->poll = freestyle_active_module_poll;
ot->exec = freestyle_module_remove_exec;
/* flags */
@@ -673,6 +682,7 @@ void SCENE_OT_freestyle_module_move(wmOperatorType *ot)
ot->description = "Change the position of the style module within in the list of style modules";
/* api callbacks */
ot->poll = freestyle_active_module_poll;
ot->exec = freestyle_module_move_exec;
/* flags */