Revision: 18274
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18274
Author: nicholasbishop
Date: 2009-01-03 00:05:28 +0100 (Sat, 03 Jan 2009)
Log Message:
-----------
Made the basic RNA changes for Tex(ture), no properties wrapped yet.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
2009-01-02 22:37:00 UTC (rev 18273)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
2009-01-02 23:05:28 UTC (rev 18274)
@@ -3203,8 +3203,8 @@
return ICON_PARTICLES;
else if(rnatype == &RNA_Material)
return ICON_MATERIAL;
- /*else if(rnatype == &RNA_Texture)
- return ICON_TEXTURE;*/
+ else if(rnatype == &RNA_Texture)
+ return ICON_TEXTURE;
else if(rnatype == &RNA_Image)
return ICON_TEXTURE;
else if(rnatype == &RNA_Screen)
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-02 23:05:28 UTC (rev 18274)
@@ -207,6 +207,7 @@
extern StructRNA RNA_TextBox;
extern StructRNA RNA_TextLine;
extern StructRNA RNA_TextMarker;
+extern StructRNA RNA_Texture;
extern StructRNA RNA_TouchSensor;
extern StructRNA RNA_TransformSequence;
extern StructRNA RNA_UVProjectModifier;
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
2009-01-02 23:05:28 UTC (rev 18274)
@@ -63,6 +63,7 @@
rna_sequence.c
rna_sound.c
rna_text.c
+ rna_texture.c
rna_userdef.c
rna_vfont.c
rna_wm.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-02 23:05:28 UTC (rev 18274)
@@ -932,6 +932,7 @@
{"rna_sensor.c", RNA_def_sensor},
{"rna_sequence.c", RNA_def_sequence},
{"rna_text.c", RNA_def_text},
+ {"rna_texture.c", RNA_def_texture},
{"rna_sound.c", RNA_def_sound},
{"rna_userdef.c", RNA_def_userdef},
{"rna_vfont.c", RNA_def_vfont},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2009-01-02 23:05:28 UTC (rev 18274)
@@ -78,6 +78,7 @@
case ID_SCR: return &RNA_Screen;
case ID_SO: return &RNA_Sound;
case ID_TXT: return &RNA_Text;
+ case ID_TE: return &RNA_Texture;
case ID_VF: return &RNA_VectorFont;
case ID_WO: return &RNA_World;
case ID_WM: return &RNA_WindowManager;
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2009-01-02 23:05:28 UTC (rev 18274)
@@ -129,6 +129,7 @@
void RNA_def_sensor(struct BlenderRNA *brna);
void RNA_def_sequence(struct BlenderRNA *brna);
void RNA_def_text(struct BlenderRNA *brna);
+void RNA_def_texture(struct BlenderRNA *brna);
void RNA_def_sound(struct BlenderRNA *brna);
void RNA_def_userdef(struct BlenderRNA *brna);
void RNA_def_vfont(struct BlenderRNA *brna);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c
2009-01-02 22:37:00 UTC (rev 18273)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c
2009-01-02 23:05:28 UTC (rev 18274)
@@ -236,7 +236,7 @@
{"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve
datablocks."},
{"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs",
"Metaball datablocks."},
{"vfonts", "VectorFont", "rna_Main_vfont_begin", "Vector
Fonts", "Vector font datablocks."},
- {"textures", "ID", "rna_Main_tex_begin", "Textures", "Texture
datablocks."},
+ {"textures", "Texture", "rna_Main_tex_begin", "Textures",
"Texture datablocks."},
{"ipos", "Ipo", "rna_Main_ipo_begin", "Ipos", "Ipo
datablocks."},
{"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush
datablocks."},
{"worlds", "World", "rna_Main_world_begin", "Worlds", "World
datablocks."},
Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
2009-01-02 23:05:28 UTC (rev 18274)
@@ -0,0 +1,48 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Contributor(s): Blender Foundation (2008).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_texture_types.h"
+
+#ifdef RNA_RUNTIME
+
+#else
+
+void RNA_def_texture(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "Texture", "ID");
+ RNA_def_struct_sdna(srna, "Tex");
+ RNA_def_struct_ui_text(srna, "Texture", "DOC_BROKEN");
+
+
+}
+
+#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
