[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40478] branches/bmesh/blender: svn merge ^/trunk/blender -r40371:40372
Campbell Barton
ideasman42 at gmail.com
Fri Sep 23 07:59:38 CEST 2011
Revision: 40478
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40478
Author: campbellbarton
Date: 2011-09-23 05:59:37 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40371:40372
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40371
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/gpu/GPU_draw.h
branches/bmesh/blender/source/blender/gpu/GPU_material.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/makesdna/DNA_material_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_BlenderShader.h
branches/bmesh/blender/source/gameengine/Ketsji/BL_Material.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Material.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40371
+ /trunk/blender:39992-40372
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40371
+ /trunk/blender/release:31524-40372
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-09-23 05:59:37 UTC (rev 40478)
@@ -289,53 +289,6 @@
layout.prop(lay, "name")
-class DATA_PT_texface(MeshButtonsPanel, Panel):
- bl_label = "Texture Face"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- @classmethod
- def poll(cls, context):
- obj = context.object
- return (context.mode == 'EDIT_MESH') and obj and obj.type == 'MESH'
-
- def draw(self, context):
- layout = self.layout
- col = layout.column()
-
- me = context.mesh
-
- tf = me.faces.active_tface
-
- if tf:
- if context.scene.render.engine != 'BLENDER_GAME':
- col.label(text="Options only supported in Game Engine")
-
- split = layout.split()
- col = split.column()
-
- col.prop(tf, "use_image")
- col.prop(tf, "use_light")
- col.prop(tf, "hide")
- col.prop(tf, "use_collision")
-
- col.prop(tf, "use_blend_shared")
- col.prop(tf, "use_twoside")
- col.prop(tf, "use_object_color")
-
- col = split.column()
-
- col.prop(tf, "use_halo")
- col.prop(tf, "use_billboard")
- col.prop(tf, "use_shadow_cast")
- col.prop(tf, "use_bitmap_text")
- col.prop(tf, "use_alpha_sort")
-
- col = layout.column()
- col.prop(tf, "blend_type")
- else:
- col.label(text="No UV Texture")
-
-
class DATA_PT_vertex_colors(MeshButtonsPanel, Panel):
bl_label = "Vertex Colors"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py 2011-09-23 05:59:37 UTC (rev 40478)
@@ -612,9 +612,37 @@
col.prop(halo, "flare_subflare_size", text="Subsize")
-class MATERIAL_PT_physics(MaterialButtonsPanel, Panel):
+class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
+ bl_label = "Game Settings"
+ COMPAT_ENGINES = {'BLENDER_GAME'}
+
+ @classmethod
+ def poll(cls, context):
+ return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES)
+
+ def draw(self, context):
+ layout = self.layout
+ game = context.material.game_settings # dont use node material
+
+ row = layout.row()
+ row.prop(game, "back_culling")
+ row.prop(game, "invisible")
+ row.prop(game, "text")
+
+ row = layout.row()
+ row.label(text="Alpha Blend:")
+ row.label(text="Face Orientation:")
+ row = layout.row()
+ row.prop(game,"alpha_blend",text="")
+ row.prop(game,"face_orientation",text="")
+
+class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
bl_label = "Physics"
COMPAT_ENGINES = {'BLENDER_GAME'}
+
+ def draw_header(self, context):
+ game = context.material.game_settings
+ self.layout.prop(game, "physics", text="")
@classmethod
def poll(cls, context):
@@ -622,6 +650,7 @@
def draw(self, context):
layout = self.layout
+ layout.active = context.material.game_settings.physics
phys = context.material.physics # dont use node material
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2011-09-23 05:59:37 UTC (rev 40478)
@@ -382,6 +382,7 @@
layout.operator("wm.console_toggle", icon='CONSOLE')
layout.separator()
layout.operator("anim.update_data_paths", text="FCurve/Driver Version fix", icon='HELP')
+ layout.operator("logic.texface_convert", text="TexFace to Material Convert", icon='GAME')
layout.separator()
layout.operator("wm.splash", icon='BLENDER')
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h 2011-09-23 05:59:37 UTC (rev 40478)
@@ -44,7 +44,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 259
-#define BLENDER_SUBVERSION 2
+#define BLENDER_SUBVERSION 3
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_image.h 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_image.h 2011-09-23 05:59:37 UTC (rev 40478)
@@ -168,6 +168,9 @@
/* merge source into dest, and free source */
void BKE_image_merge(struct Image *dest, struct Image *source);
+/* check if texture has alpha (depth=32) */
+int BKE_image_has_alpha(struct Image *image);
+
/* image_gen.c */
void BKE_image_buf_fill_color(unsigned char *rect, float *rect_float, int width, int height, float color[4]);
void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int height, int width);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_material.h 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_material.h 2011-09-23 05:59:37 UTC (rev 40478)
@@ -42,6 +42,8 @@
struct Material;
struct ID;
struct Object;
+struct Mesh;
+struct MTFace;
/* materials */
@@ -50,6 +52,7 @@
void test_object_materials(struct ID *id);
void resize_object_material(struct Object *ob, const short totcol);
void init_material(struct Material *ma);
+struct Material *add_material_main(struct Main *main, const char *name);
struct Material *add_material(const char *name);
struct Material *copy_material(struct Material *ma);
struct Material *localize_material(struct Material *ma);
@@ -101,6 +104,9 @@
void copy_mat_mtex_copybuf(struct ID *id);
void paste_mat_mtex_copybuf(struct ID *id);
+/* handle backward compatibility for tface/materials called from doversion (fileload=1) or Help Menu (fileload=0) */
+int do_version_tface(struct Main *main, int fileload);
+
#ifdef __cplusplus
}
#endif
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-09-23 05:59:37 UTC (rev 40478)
@@ -1098,15 +1098,12 @@
MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE);
float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
int a, b, dodraw, matnr, new_matnr;
- int transp, new_transp, orig_transp;
int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
cdDM_update_normals_from_pbvh(dm);
matnr = -1;
dodraw = 0;
- transp = GPU_get_material_blend_mode();
- orig_transp = transp;
glShadeModel(GL_SMOOTH);
@@ -1146,22 +1143,6 @@
continue;
}
- if(tf) {
- new_transp = tf[a].transp;
-
- if(new_transp != transp) {
- glEnd();
-
- if(new_transp == GPU_BLEND_SOLID && orig_transp != GPU_BLEND_SOLID)
- GPU_set_material_blend_mode(orig_transp);
- else
- GPU_set_material_blend_mode(new_transp);
- transp = new_transp;
-
- glBegin(GL_QUADS);
- }
- }
-
if(!smoothnormal) {
if(nors) {
glNormal3fv(nors[a]);
@@ -1294,33 +1275,6 @@
continue;
}
- if(tf) {
- new_transp = tf[a].transp;
-
- if(new_transp != transp) {
- numfaces = curface - start;
- if( numfaces > 0 ) {
- if( dodraw ) {
- if( numdata != 0 ) {
- GPU_buffer_unlock(buffer);
- GPU_interleaved_attrib_setup(buffer,datatypes,numdata);
- }
- glDrawArrays(GL_TRIANGLES,start*3,(curface-start)*3);
- if( numdata != 0 ) {
- varray = GPU_buffer_lock_stream(buffer);
- }
- }
- }
- start = curface;
-
- if(new_transp == GPU_BLEND_SOLID && orig_transp != GPU_BLEND_SOLID)
- GPU_set_material_blend_mode(orig_transp);
- else
- GPU_set_material_blend_mode(new_transp);
- transp = new_transp;
- }
- }
-
if( numdata != 0 ) {
offset = 0;
if(attribs.totorco) {
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-09-23 05:20:15 UTC (rev 40477)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-09-23 05:59:37 UTC (rev 40478)
@@ -340,7 +340,7 @@
static void layerDefault_tface(void *data, int count)
{
static MTFace default_tf = {{{0, 0}, {1, 0}, {1, 1}, {0, 1}}, NULL,
- 0, 0, TF_DYNAMIC, 0, 0};
+ 0, 0, TF_DYNAMIC|TF_CONVERTED, 0, 0};
MTFace *tf = (MTFace*)data;
int i;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list