[Bf-blender-cvs] [1c06064bfb6] blender2.8-workbench: Fixed incorrect merge

Jeroen Bakker noreply at git.blender.org
Sun Apr 29 18:38:14 CEST 2018


Commit: 1c06064bfb675d17d26e600433d0bea08916b032
Author: Jeroen Bakker
Date:   Sun Apr 29 18:37:53 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rB1c06064bfb675d17d26e600433d0bea08916b032

Fixed incorrect merge

===================================================================

M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 0b9fd99d9f5..502b9d0b109 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2354,7 +2354,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "drawtype_options", V3D_DRAWOPTION_SHADOW);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_ui_text(prop, "Shadow", "Show Shadow");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_3DViewShading_type_update");
 
 	prop = RNA_def_property(srna, "local_view", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "localvd");



More information about the Bf-blender-cvs mailing list