Commit: 3fc578d7cb4409aaba86ea179f27fdf71554a733 Author: Nick Wu Date: Sat Sep 1 11:03:10 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3fc578d7cb4409aaba86ea179f27fdf71554a733
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts: # source/blender/CMakeLists.txt =================================================================== =================================================================== diff --cc source/blender/CMakeLists.txt index f35f3b55162,a4d8e21c349..0040168d4af --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@@ -91,10 -94,6 +94,7 @@@ set(SRC_DNA_IN ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_workspace_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lanpr_types.h ) add_subdirectory(datatoc) diff --cc source/blender/makesrna/intern/CMakeLists.txt index 6edab2a0391,a795b4c6cae..78d177146ae --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@@ -57,8 -56,8 +56,9 @@@ set(DEFSR rna_lamp.c rna_lattice.c rna_layer.c + rna_lightprobe.c rna_linestyle.c + rna_lanpr.c rna_main.c rna_mask.c rna_material.c diff --cc source/blender/makesrna/intern/rna_scene.c index a099e2c6145,84910b6b1b3..919e941c8f0 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@@ -2500,9 -2448,16 +2500,16 @@@ static void rna_def_tool_settings(Blend prop = RNA_def_property(srna, "use_gpencil_thumbnail_list", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "gpencil_flags", GP_TOOL_FLAG_THUMBNAIL_LIST); RNA_def_property_ui_text(prop, "Compact List", - "Show compact list of color instead of thumbnails"); + "Show compact list of color instead of thumbnails"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); + prop = RNA_def_property(srna, "add_gpencil_weight_data", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "gpencil_flags", GP_TOOL_FLAG_CREATE_WEIGHTS); + RNA_def_property_ui_text(prop, "Add weight data for new strokes", + "When creating new strokes, the weight data is added according to the current vertex group and weight, " + "if no vertex group selected, weight is not added"); + RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); + prop = RNA_def_property(srna, "gpencil_sculpt", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "gp_sculpt"); RNA_def_property_struct_type(prop, "GPencilSculptSettings"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs