From 4c4aa65adbef3b119fbd1e3e5e8bb17bdef67718 Mon Sep 17 00:00:00 2001 From: Andrew Hale Date: Mon, 6 Aug 2018 11:37:49 +0200 Subject: [PATCH 1/2] PyAPI: Make skin modifier roots settable This make the root flag writable using the Python API, using the generic skin vertex flag setter function. Reviewed By: Campbell Barton Differential Revision: http://developer.blender.org/D3583 --- source/blender/makesrna/intern/rna_mesh.c | 4 +++- source/blender/python/bmesh/bmesh_py_types_meshdata.c | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 0b8f90e1c68..0e0e869a340 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -3220,7 +3220,9 @@ static void rna_def_skin_vertices(BlenderRNA *brna, PropertyRNA *UNUSED(cprop)) prop = RNA_def_property(srna, "use_root", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MVERT_SKIN_ROOT); - RNA_def_property_ui_text(prop, "Root", "Vertex is a root for rotation calculations and armature generation"); + RNA_def_property_ui_text(prop, "Root", + "Vertex is a root for rotation calculations and armature generation, " + "setting this flag does not clear other roots in the same mesh island"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop = RNA_def_property(srna, "use_loose", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index ea606329b07..fabbfdb94c5 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -282,7 +282,7 @@ static int bpy_bmvertskin_radius_set(BPy_BMVertSkin *self, PyObject *value, void } PyDoc_STRVAR(bpy_bmvertskin_flag__use_root_doc, -"Use as root vertex.\n\n:type: boolean" +"Use as root vertex. Setting this flag does not clear other roots in the same mesh island.\n\n:type: boolean" ); PyDoc_STRVAR(bpy_bmvertskin_flag__use_loose_doc, "Use loose vertex.\n\n:type: boolean" @@ -311,17 +311,16 @@ static int bpy_bmvertskin_flag_set(BPy_BMVertSkin *self, PyObject *value, void * } } -/* XXX Todo: Make root settable, currently the code to disable all other verts as roots sits within the modifier */ static PyGetSetDef bpy_bmvertskin_getseters[] = { /* attributes match rna_mesh_gen */ {(char *)"radius", (getter)bpy_bmvertskin_radius_get, (setter)bpy_bmvertskin_radius_set, (char *)bpy_bmvertskin_radius_doc, NULL}, - {(char *)"use_root", (getter)bpy_bmvertskin_flag_get, (setter)NULL, (char *)bpy_bmvertskin_flag__use_root_doc, (void *)MVERT_SKIN_ROOT}, + {(char *)"use_root", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, (char *)bpy_bmvertskin_flag__use_root_doc, (void *)MVERT_SKIN_ROOT}, {(char *)"use_loose", (getter)bpy_bmvertskin_flag_get, (setter)bpy_bmvertskin_flag_set, (char *)bpy_bmvertskin_flag__use_loose_doc, (void *)MVERT_SKIN_LOOSE}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; -static PyTypeObject BPy_BMVertSkin_Type; /* bm.loops.layers.uv.active */ +static PyTypeObject BPy_BMVertSkin_Type; /* bm.loops.layers.skin.active */ static void bm_init_types_bmvertskin(void) { From 931a279f441f6f9c3266d4789e9aa5aed1c16aa8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Aug 2018 11:00:57 +1000 Subject: [PATCH 2/2] Cleanup: use static variables --- intern/clog/clog.c | 2 +- intern/ghost/intern/GHOST_TaskbarX11.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/clog/clog.c b/intern/clog/clog.c index 9a80d99fe73..f64e7c19a5f 100644 --- a/intern/clog/clog.c +++ b/intern/clog/clog.c @@ -559,7 +559,7 @@ static void CLG_ctx_free(CLogContext *ctx) * \{ */ /* We could support multiple at once, for now this seems not needed. */ -struct CLogContext *g_ctx = NULL; +static struct CLogContext *g_ctx = NULL; void CLG_init(void) { diff --git a/intern/ghost/intern/GHOST_TaskbarX11.cpp b/intern/ghost/intern/GHOST_TaskbarX11.cpp index 2ef82dc6636..9826ccdfa37 100644 --- a/intern/ghost/intern/GHOST_TaskbarX11.cpp +++ b/intern/ghost/intern/GHOST_TaskbarX11.cpp @@ -44,7 +44,7 @@ static unity_event_loop_t unity_event_loop; static bool libunity_initialized = false; static bool libunity_available = false; -void* libunity_handle = NULL; +static void *libunity_handle = NULL; void GHOST_TaskBarX11::free() {