[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54007] trunk/blender/source/blender/ makesrna/intern/rna_space.c: Matcap fix: on enabling it, and when no matcap was selected before,

[Ton Roosendaal]

Revision: 54007
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54007
Author:   ton
Date:     2013-01-22 18:36:11 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Matcap fix: on enabling it, and when no matcap was selected before, 
it sets first matcap icon.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-01-22 18:13:22 UTC (rev 54006)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-01-22 18:36:11 UTC (rev 54007)
@@ -397,6 +397,13 @@
 	}
 }
 
+static void rna_SpaceView3D_matcap_enable(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	View3D *v3d = (View3D *)(ptr->data);
+	
+	if (v3d->matcap_icon == 0)
+		v3d->matcap_icon = ICON_MATCAP_01;
+}
 
 static void rna_SpaceView3D_pivot_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
 {
@@ -1866,7 +1873,7 @@
 	prop = RNA_def_property(srna, "use_matcap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SOLID_MATCAP);
 	RNA_def_property_ui_text(prop, "Matcap", "Active Objects draw images mapped on normals, enhancing Solid Draw Mode");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_matcap_enable");
 	
 	prop = RNA_def_property(srna, "matcap_icon", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "matcap_icon");