[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29849] branches/soc-2010-rohith291991: merged 29739-29848
Rohith B V
rohith291991 at gmail.com
Thu Jul 1 16:44:13 CEST 2010
Revision: 29849
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29849
Author: rohith291991
Date: 2010-07-01 16:44:12 +0200 (Thu, 01 Jul 2010)
Log Message:
-----------
merged 29739-29848
Modified Paths:
--------------
branches/soc-2010-rohith291991/CMakeLists.txt
branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp
branches/soc-2010-rohith291991/release/scripts/ui/properties_object.py
branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_common.py
branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-rohith291991/release/scripts/ui/properties_render.py
branches/soc-2010-rohith291991/release/scripts/ui/space_userpref.py
branches/soc-2010-rohith291991/source/blender/blenkernel/BKE_displist.h
branches/soc-2010-rohith291991/source/blender/blenkernel/BKE_image.h
branches/soc-2010-rohith291991/source/blender/blenkernel/BKE_lattice.h
branches/soc-2010-rohith291991/source/blender/blenkernel/BKE_mball.h
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/displist.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/image.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/mball.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/particle.c
branches/soc-2010-rohith291991/source/blender/blenkernel/intern/texture.c
branches/soc-2010-rohith291991/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-rohith291991/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2010-rohith291991/source/blender/blenlib/intern/bpath.c
branches/soc-2010-rohith291991/source/blender/blenloader/intern/readfile.c
branches/soc-2010-rohith291991/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-rohith291991/source/blender/editors/interface/interface_layout.c
branches/soc-2010-rohith291991/source/blender/editors/interface/interface_templates.c
branches/soc-2010-rohith291991/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-rohith291991/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-rohith291991/source/blender/editors/object/object_relations.c
branches/soc-2010-rohith291991/source/blender/editors/render/render_opengl.c
branches/soc-2010-rohith291991/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-rohith291991/source/blender/editors/space_image/image_ops.c
branches/soc-2010-rohith291991/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-rohith291991/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-rohith291991/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-rohith291991/source/blender/editors/transform/transform.c
branches/soc-2010-rohith291991/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-rohith291991/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-rohith291991/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2010-rohith291991/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-rohith291991/source/blender/python/doc/sphinx_doc_gen.sh
branches/soc-2010-rohith291991/source/blender/render/CMakeLists.txt
branches/soc-2010-rohith291991/source/blender/render/intern/source/convertblender.c
branches/soc-2010-rohith291991/source/blender/render/intern/source/rayshade.c
branches/soc-2010-rohith291991/source/blender/windowmanager/intern/wm_keymap.c
Added Paths:
-----------
branches/soc-2010-rohith291991/source/blender/makesrna/rna_cleanup/
branches/soc-2010-rohith291991/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-rohith291991/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-rohith291991/source/blender/python/doc/examples/bpy.data.py
Removed Paths:
-------------
branches/soc-2010-rohith291991/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-rohith291991/source/blender/makesrna/rna_cleanup/rna_cleaner.py
Modified: branches/soc-2010-rohith291991/CMakeLists.txt
===================================================================
--- branches/soc-2010-rohith291991/CMakeLists.txt 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/CMakeLists.txt 2010-07-01 14:44:12 UTC (rev 29849)
@@ -304,6 +304,10 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+ IF(WITH_RAYOPTIMIZATION)
+ SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+ ENDIF(WITH_RAYOPTIMIZATION)
+
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
Modified: branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp 2010-07-01 14:44:12 UTC (rev 29849)
@@ -390,6 +390,7 @@
{
double totarea=0;
+double totenergy=0;
Comiso solver;
int totedge,totface,totvert;
totvert=mesh->numVerts;
@@ -409,27 +410,34 @@
vz=0;
double energy=0;
- int e1,e2;
+ int e1,e2,v1,v2;
e1=mesh->faces[i].edges[0];
e2=mesh->faces[i].edges[1];
+ v1=mesh->edges[e1].v[0];
+ v2=mesh->edges[e1].v[1];
- x1=mesh->edges[e1].v[1].co[0]-mesh->edges[e1].v[0].co[0];
- y1=mesh->edges[e1].v[1].co[1]-mesh->edges[e1].v[0].co[1];
- z1=mesh->edges[e1].v[1].co[2]-mesh->edges[e1].v[0].co[2];
- x2=mesh->edges[e2].v[1].co[0]-mesh->edges[e1].v[0].co[0];
- y2=mesh->edges[e2].v[1].co[1]-mesh->edges[e1].v[0].co[1];
- z2=mesh->edges[e2].v[1].co[2]-mesh->edges[e1].v[0].co[2];
+ x1=mesh->verts[v2].co[0]-mesh->verts[v1].co[0];
+ y1=mesh->verts[v2].co[1]-mesh->verts[v1].co[1];
+ z1=mesh->verts[v2].co[2]-mesh->verts[v1].co[2];
+ x2=mesh->verts[v2].co[0]-mesh->verts[v1].co[0];
+ y2=mesh->verts[v2].co[1]-mesh->verts[v1].co[1];
+ z2=mesh->verts[v2].co[2]-mesh->verts[v1].co[2];
+ /*
+ i j k
x1 y1 z1
x2 y2 z2
- i j k
-
- x1(y2k-z2j)-y1(x2k-z2i)+z1(x2j-y2i)
+
+ x1(y2k-z2j)-y1(x2k-z2i)+z1(x2j-y2i)*/
double area=sqrt((x1*y2-y1*x2)*(x1*y2-y1*x2)+(y1*z2-y2*z1)*(y1*z2-y2*z1)+(z1*x2-z2*x1)*(z1*x2-z2*x1));
totarea+=area;
-
+ //calculate ET
+ //energy=blah
+ totenergy+=energy*area;
+
}
+return 1;
}
\ No newline at end of file
Modified: branches/soc-2010-rohith291991/release/scripts/ui/properties_object.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/properties_object.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/properties_object.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -155,9 +155,9 @@
ob = context.object
wide_ui = context.region.width > narrowui
- split = layout.split(percentage=0.8, align=True)
- split.operator("object.group_link", text="Add to Group")
- split.operator("object.group_add", text="", icon='ZOOMIN')
+ row = layout.row(align=True)
+ row.operator("object.group_link", text="Add to Group")
+ row.operator("object.group_add", text="", icon='ZOOMIN')
# XXX, this is bad practice, yes, I wrote it :( - campbell
index = 0
@@ -214,7 +214,7 @@
col.prop(ob, "draw_name", text="Name")
col.prop(ob, "draw_axis", text="Axis")
col.prop(ob, "draw_wire", text="Wire")
- col.prop(ob, "color", text="")
+ col.prop(ob, "color", text="Object Color")
if wide_ui:
col = split.column()
Modified: branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_cloth.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_cloth.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -87,7 +87,7 @@
col = split.column()
col.label(text="Presets:")
- sub = col.row(align=True).split(percentage=0.75)
+ sub = col.row(align=True)
sub.menu("CLOTH_MT_presets", text=bpy.types.CLOTH_MT_presets.bl_label)
sub.operator("cloth.preset_add", text="", icon="ZOOMIN")
Modified: branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_common.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_common.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_common.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -38,7 +38,7 @@
col.operator("ptcache.remove", icon='ZOOMOUT', text="")
row = layout.row()
- if cachetype in {'PSYS', 'HAIR'}:
+ if cachetype in {'PSYS', 'HAIR', 'SMOKE'}:
row.prop(cache, "external")
if cache.external:
Modified: branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_softbody.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/properties_physics_softbody.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -186,10 +186,13 @@
sub.active = softbody.stiff_quads
sub.prop(softbody, "shear")
- col.prop(softbody, "new_aero", text="Aero")
- sub = col.column()
- sub.enabled = softbody.new_aero
- sub.prop(softbody, "aero", text="Factor")
+ col.label(text="Aerodynamics:")
+ col.row().prop(softbody, "aerodynamics_type", expand=True)
+ col.prop(softbody, "aero", text="Factor")
+
+ #sub = col.column()
+ #sub.enabled = softbody.aero > 0
+
col.label(text="Collision:")
col.prop(softbody, "edge_collision", text="Edge")
Modified: branches/soc-2010-rohith291991/release/scripts/ui/properties_render.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/properties_render.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/properties_render.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -536,10 +536,9 @@
rd = scene.render
wide_ui = context.region.width > narrowui
- row = layout.row().split()
- sub = row.row(align=True).split(percentage=0.75)
- sub.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
- sub.operator("render.preset_add", text="", icon="ZOOMIN")
+ row = layout.row(align=True)
+ row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
+ row.operator("render.preset_add", text="", icon="ZOOMIN")
split = layout.split()
Modified: branches/soc-2010-rohith291991/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2010-rohith291991/release/scripts/ui/space_userpref.py 2010-07-01 14:08:41 UTC (rev 29848)
+++ branches/soc-2010-rohith291991/release/scripts/ui/space_userpref.py 2010-07-01 14:44:12 UTC (rev 29849)
@@ -818,7 +818,8 @@
userpref = context.user_preferences
return (userpref.active_section == 'ADDONS')
- def _addon_list(self):
+ @staticmethod
+ def _addon_list():
import sys
modules = []
loaded_modules = set()
@@ -843,18 +844,20 @@
cats = {info["category"] for mod, info in addons}
cats.discard("")
- cats = ['All', 'Disabled', 'Enabled'] + sorted(cats)
+ cats = ["All", "Enabled", "Disabled"] + sorted(cats)
bpy.types.Scene.EnumProperty(items=[(cat, cat, str(i)) for i, cat in enumerate(cats)],
name="Category", attr="addon_filter", description="Filter add-ons by category")
bpy.types.Scene.StringProperty(name="Search", attr="addon_search",
description="Search within the selected filter")
- row = layout.row()
- row.prop(context.scene, "addon_filter", text="Filter")
- row.prop(context.scene, "addon_search", text="Search", icon='VIEWZOOM')
- layout.separator()
+ split = layout.split(percentage=0.2)
+ col = split.column()
+ col.prop(context.scene, "addon_filter", text="Filter", expand=True)
+ col.prop(context.scene, "addon_search", text="", icon='VIEWZOOM')
+ col = split.column()
+
filter = context.scene.addon_filter
search = context.scene.addon_search.lower()
@@ -878,9 +881,9 @@
continue
# Addon UI Code
- box = layout.column().box()
- column = box.column()
- row = column.row()
+ box = col.column().box()
+ colsub = box.column()
+ row = colsub.row()
row.operator("wm.addon_expand", icon='TRIA_DOWN' if info["expanded"] else 'TRIA_RIGHT', emboss=False).module = module_name
@@ -896,27 +899,27 @@
# Expanded UI (only if additional infos are available)
if info["expanded"]:
if info["description"]:
- split = column.row().split(percentage=0.15)
+ split = colsub.row().split(percentage=0.15)
split.label(text='Description:')
split.label(text=info["description"])
if info["location"]:
- split = column.row().split(percentage=0.15)
+ split = colsub.row().split(percentage=0.15)
split.label(text='Location:')
split.label(text=info["location"])
if info["author"]:
- split = column.row().split(percentage=0.15)
+ split = colsub.row().split(percentage=0.15)
split.label(text='Author:')
split.label(text=info["author"])
if info["version"]:
- split = column.row().split(percentage=0.15)
+ split = colsub.row().split(percentage=0.15)
split.label(text='Version:')
split.label(text=info["version"])
if info["warning"]:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list