diff options
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 5 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_wireframe.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 278a2700f27..b74ad3c7dc2 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -989,6 +989,7 @@ def pymodule2sphinx(basepath, module_name, module, title): # Changes in Blender will force errors here context_type_map = { # context_member: (RNA type, is_collection) + "active_annotation_layer": ("GPencilLayer", False), "active_base": ("ObjectBase", False), "active_bone": ("EditBone", False), "active_gpencil_frame": ("GreasePencilLayer", True), @@ -998,6 +999,8 @@ context_type_map = { "active_operator": ("Operator", False), "active_pose_bone": ("PoseBone", False), "active_editable_fcurve": ("FCurve", False), + "annotation_data": ("GreasePencil", False), + "annotation_data_owner": ("ID", False), "armature": ("Armature", False), "bone": ("Bone", False), "brush": ("Brush", False), diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index a02ff98a38a..9008348ed3b 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -1668,7 +1668,8 @@ StudioLight *BKE_studiolight_create(const char *path, const float light_ambient[3]) { StudioLight *sl = studiolight_create(STUDIOLIGHT_EXTERNAL_FILE | STUDIOLIGHT_USER_DEFINED | - STUDIOLIGHT_TYPE_STUDIO); + STUDIOLIGHT_TYPE_STUDIO | + STUDIOLIGHT_SPECULAR_HIGHLIGHT_PASS); char filename[FILE_MAXFILE]; BLI_split_file_part(path, filename, FILE_MAXFILE); @@ -1688,7 +1689,7 @@ StudioLight *BKE_studiolight_create(const char *path, StudioLight *BKE_studiolight_studio_edit_get(void) { static StudioLight sl = {0}; - sl.flag = STUDIOLIGHT_TYPE_STUDIO; + sl.flag = STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_SPECULAR_HIGHLIGHT_PASS; memcpy(sl.light, U.light_param, sizeof(*sl.light) * 4); memcpy(sl.light_ambient, U.light_ambient, sizeof(*sl.light_ambient) * 3); diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c index b52434fa6c6..d3c513e5963 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.c +++ b/source/blender/draw/engines/overlay/overlay_wireframe.c @@ -167,9 +167,10 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata, /* Don't do that in edit Mesh mode, unless there is a modifier preview. */ if (use_wire && (!is_mesh || (!is_edit_mode || has_edit_mesh_cage))) { + const bool is_sculpt_mode = ((ob->mode & OB_MODE_SCULPT) != 0) && (ob->sculpt != NULL); const bool use_sculpt_pbvh = BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d) && !DRW_state_is_image_render(); - const bool use_coloring = (use_wire && !is_edit_mode && !use_sculpt_pbvh && + const bool use_coloring = (use_wire && !is_edit_mode && !is_sculpt_mode && !has_edit_mesh_cage); DRWShadingGroup *shgrp = NULL; struct GPUBatch *geom = DRW_cache_object_face_wireframe_get(ob); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index ffbcacafd44..6eabb079f4e 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -4957,7 +4957,7 @@ static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) EDBM_selectmode_to_scene(C); } - DEG_id_tag_update(obedit->data, ID_RECALC_SELECT); + DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); } MEM_freeN(objects); |