[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42704] trunk/blender/source/blender/ makesrna/intern: - remove rna access to deprecated sequencer attributes x/ y offset & zoom.
Campbell Barton
ideasman42 at gmail.com
Sun Dec 18 10:37:01 CET 2011
Revision: 42704
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42704
Author: campbellbarton
Date: 2011-12-18 09:36:47 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
- remove rna access to deprecated sequencer attributes x/y offset & zoom.
- Object.to_mesh was still using deprecated colbits variable (object material wouldnt work for any material after 16)
- dont set colbits when setting material slot anymore.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-12-18 08:50:06 UTC (rev 42703)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-12-18 09:36:47 UTC (rev 42704)
@@ -809,11 +809,11 @@
if(value) {
ob->matbits[index]= 1;
- ob->colbits |= (1<<index);
+ /* ob->colbits |= (1<<index); */ /* DEPRECATED */
}
else {
ob->matbits[index]= 0;
- ob->colbits &= ~(1<<index);
+ /* ob->colbits &= ~(1<<index); */ /* DEPRECATED */
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2011-12-18 08:50:06 UTC (rev 42703)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2011-12-18 09:36:47 UTC (rev 42704)
@@ -191,13 +191,12 @@
if( tmpcu->mat ) {
for( i = tmpcu->totcol; i-- > 0; ) {
/* are we an object material or data based? */
- if (ob->colbits & 1<<i)
- tmpmesh->mat[i] = ob->mat[i];
- else
- tmpmesh->mat[i] = tmpcu->mat[i];
- if (tmpmesh->mat[i])
+ tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpcu->mat[i];
+
+ if (tmpmesh->mat[i]) {
tmpmesh->mat[i]->id.us++;
+ }
}
}
break;
@@ -230,12 +229,11 @@
if( origmesh->mat ) {
for( i = origmesh->totcol; i-- > 0; ) {
/* are we an object material or data based? */
- if (ob->colbits & 1<<i)
- tmpmesh->mat[i] = ob->mat[i];
- else
- tmpmesh->mat[i] = origmesh->mat[i];
- if (tmpmesh->mat[i])
+ tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : origmesh->mat[i];
+
+ if (tmpmesh->mat[i]) {
tmpmesh->mat[i]->id.us++;
+ }
}
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-12-18 08:50:06 UTC (rev 42703)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-12-18 09:36:47 UTC (rev 42704)
@@ -2000,23 +2000,6 @@
RNA_def_property_enum_items(prop, proxy_render_size_items);
RNA_def_property_ui_text(prop, "Proxy render size", "Draw preview using full resolution or different proxy resolutions");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
-
-
- /* not sure we need rna access to these but adding anyway */
- prop= RNA_def_property(srna, "offset_x", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "xof");
- RNA_def_property_ui_text(prop, "X Offset", "Offset image horizontally from the view center");
- RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
-
- prop= RNA_def_property(srna, "offset_y", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "yof");
- RNA_def_property_ui_text(prop, "Y Offset", "Offset image vertically from the view center");
- RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
-
- prop= RNA_def_property(srna, "zoom", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "zoom");
- RNA_def_property_ui_text(prop, "Zoom", "Display zoom level");
- RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
}
static void rna_def_space_text(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list