[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17455] branches/blender2.5/blender/source /blender/makesrna/intern:

Brecht Van Lommel brecht at blender.org
Fri Nov 14 12:16:02 CET 2008


Revision: 17455
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17455
Author:   blendix
Date:     2008-11-14 12:15:53 +0100 (Fri, 14 Nov 2008)

Log Message:
-----------

RNA Tweaks:
* Added an error for RNA enums without items.
* Added to scene layer set callback.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-14 06:01:06 UTC (rev 17454)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c	2008-11-14 11:15:53 UTC (rev 17455)
@@ -565,6 +565,10 @@
 
 					fprintf(f, "};\n\n");
 				}
+				else {
+					fprintf(stderr, "rna_generate_structs: %s.%s, enum must have items defined.\n", srna->cname, prop->cname);
+					DefRNA.error= 1;
+				}
 				break;
 			}
 			case PROP_BOOLEAN: {

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2008-11-14 06:01:06 UTC (rev 17454)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c	2008-11-14 11:15:53 UTC (rev 17455)
@@ -41,6 +41,18 @@
 	return ((Base*)iter->internal)->object;
 }
 
+static void rna_Scene_layer_set(PointerRNA *ptr, int index, int value)
+{
+	Scene *scene= (Scene*)ptr->data;
+
+	if(value) scene->lay |= (1<<index);
+	else {
+		scene->lay &= ~(1<<index);
+		if(scene->lay == 0)
+			scene->lay |= (1<<index);
+	}
+}
+
 #else
 
 void RNA_def_scene(BlenderRNA *brna)
@@ -73,6 +85,7 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "lay", 1);
 	RNA_def_property_array(prop, 20);
 	RNA_def_property_ui_text(prop, "Visible Layers", "Layers visible when rendering the scene.");
+	RNA_def_property_boolean_funcs(prop, NULL, "rna_Scene_layer_set");
 
 	prop= RNA_def_property(srna, "prop_mode", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(prop, prop_mode_items);





More information about the Bf-blender-cvs mailing list