Commit: 2e914ccf14f54a71c416fcceec5feb037e9bc2d0
Author: Julian Eisel
Date: Wed Oct 12 21:54:48 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rB2e914ccf14f54a71c416fcceec5feb037e9bc2d0
Merge branch 'master' into temp_localview_split
Conflicts:
source/blender/makesrna/intern/rna_space.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_space.c
index 2e66fab,8fb9970..8f4bda0
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -2650,6 -2654,17 +2666,11 @@@ static void rna_def_space_view3d(Blende
RNA_def_property_ui_text(prop, "Visible Layers", "Layers visible in
this 3D View");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D,
"rna_SpaceView3D_layer_update");
+ prop = RNA_def_property(srna, "active_layer", PROP_INT, PROP_NONE);
+ RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
+ RNA_def_property_int_funcs(prop, "rna_SpaceView3D_active_layer_get",
NULL, NULL);
+ RNA_def_property_ui_text(prop, "Active Layer", "Active 3D view layer
index");
+
- prop = RNA_def_property(srna, "layers_local_view", PROP_BOOLEAN,
PROP_LAYER_MEMBER);
- RNA_def_property_boolean_sdna(prop, NULL, "lay", 0x01000000);
- RNA_def_property_array(prop, 8);
- RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Local View Layers", "Local view layers
visible in this 3D View");
-
prop = RNA_def_property(srna, "layers_used", PROP_BOOLEAN,
PROP_LAYER_MEMBER);
RNA_def_property_boolean_sdna(prop, NULL, "lay_used", 1);
RNA_def_property_array(prop, 20);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
