[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29542] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29468 :29540
Brecht Van Lommel
brecht at blender.org
Fri Jun 18 11:45:46 CEST 2010
Revision: 29542
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29542
Author: blendix
Date: 2010-06-18 11:45:46 +0200 (Fri, 18 Jun 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29468:29540
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_physics_softbody.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/report.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenlib/BLI_rect.h
branches/render25/source/blender/blenlib/BLI_uvproject.h
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenlib/intern/rct.c
branches/render25/source/blender/blenlib/intern/uvproject.c
branches/render25/source/blender/editors/animation/anim_channels_defines.c
branches/render25/source/blender/editors/animation/anim_channels_edit.c
branches/render25/source/blender/editors/animation/fmodifier_ui.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/armature/poselib.c
branches/render25/source/blender/editors/interface/interface_anim.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/space_action/action_edit.c
branches/render25/source/blender/editors/space_action/action_select.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_select.c
branches/render25/source/blender/editors/space_graph/space_graph.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_logic/logic_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_nla/nla_channels.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_nla/nla_select.c
branches/render25/source/blender/editors/space_node/node_select.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/editors/space_sequencer/sequencer_select.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_text/text_draw.c
branches/render25/source/blender/editors/space_view3d/CMakeLists.txt
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/makesrna/intern/rna_action.c
branches/render25/source/blender/makesrna/intern/rna_boid.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/modifiers/intern/MOD_uvproject.c
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/render25/source/blender/render/intern/source/texture_image.c
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/gameengine/Ketsji/BL_BlenderShader.h
branches/render25/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/render25/source/gameengine/Ketsji/KX_Scene.cpp
branches/render25/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/render25/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/render25/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: branches/render25/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_softbody.py 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/release/scripts/ui/properties_physics_softbody.py 2010-06-18 09:45:46 UTC (rev 29542)
@@ -197,7 +197,7 @@
class PHYSICS_PT_softbody_collision(PhysicButtonsPanel):
- bl_label = "Soft Body Collision"
+ bl_label = "Soft Body Self Collision"
bl_default_closed = True
def poll(self, context):
@@ -218,7 +218,7 @@
layout.active = softbody.self_collision and softbody_panel_enabled(md)
- layout.label(text="Collision Type:")
+ layout.label(text="Collision Ball Size Calculation:")
if wide_ui:
layout.prop(softbody, "collision_type", expand=True)
else:
Modified: branches/render25/release/scripts/ui/space_userpref.py
===================================================================
--- branches/render25/release/scripts/ui/space_userpref.py 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/release/scripts/ui/space_userpref.py 2010-06-18 09:45:46 UTC (rev 29542)
@@ -1202,10 +1202,25 @@
arrow.operator("wm.addon_expand", icon="TRIA_RIGHT").module = module_name
row.label(text=info["name"])
- row.operator("wm.addon_disable" if is_enabled else "wm.addon_enable").module = module_name
+
+ if is_enabled: operator = "wm.addon_disable"
+ else: operator = "wm.addon_enable"
+ if info["warning"]: button_icon='ERROR'
+ else: button_icon='BLENDER'
+
+ row.operator(operator, icon=button_icon).module = module_name
+
# Expanded UI (only if additional infos are available)
if info["expanded"]:
+ if info["description"]:
+ split = column.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.label(text='Location:')
+ split.label(text=info["location"])
if info["author"]:
split = column.row().split(percentage=0.15)
split.label(text='Author:')
@@ -1214,14 +1229,10 @@
split = column.row().split(percentage=0.15)
split.label(text='Version:')
split.label(text=info["version"])
- if info["location"]:
+ if info["warning"]:
split = column.row().split(percentage=0.15)
- split.label(text='Location:')
- split.label(text=info["location"])
- if info["description"]:
- split = column.row().split(percentage=0.15)
- split.label(text='Description:')
- split.label(text=info["description"])
+ split.label(text="Warning:")
+ split.label(text=' ' + info["warning"], icon = 'ERROR')
if info["wiki_url"] or info["tracker_url"]:
split = column.row().split(percentage=0.15)
split.label(text="Internet:")
@@ -1258,7 +1269,7 @@
from bpy.props import *
-def addon_info_get(mod, info_basis={"name": "", "author": "", "version": "", "blender": "", "location": "", "description": "", "wiki_url": "", "tracker_url": "", "category": "", "expanded": False}):
+def addon_info_get(mod, info_basis={"name": "", "author": "", "version": "", "blender": "", "location": "", "description": "", "wiki_url": "", "tracker_url": "", "category": "", "warning": "", "expanded": False}):
addon_info = getattr(mod, "bl_addon_info", {})
# avoid re-initializing
Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenkernel/intern/image.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -1717,7 +1717,10 @@
/* is there a PackedFile with this image ? */
if (ima->packedfile) {
- ibuf = IMB_ibImageFromMemory((unsigned char*)ima->packedfile->data, ima->packedfile->size, IB_rect|IB_multilayer);
+ flag = IB_rect|IB_multilayer;
+ if(ima->flag & IMA_DO_PREMUL) flag |= IB_premul;
+
+ ibuf = IMB_ibImageFromMemory((unsigned char*)ima->packedfile->data, ima->packedfile->size, flag);
}
else {
flag= IB_rect|IB_multilayer|IB_metadata;
Modified: branches/render25/source/blender/blenkernel/intern/report.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/report.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenkernel/intern/report.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -67,7 +67,7 @@
memset(reports, 0, sizeof(ReportList));
reports->storelevel= RPT_INFO;
- reports->printlevel= RPT_INFO;
+ reports->printlevel= RPT_ERROR;
reports->flag= flag;
}
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -2194,7 +2194,7 @@
seq->scene->markers.first= seq->scene->markers.last= NULL;
#endif
- if(sequencer_view3d_cb && doseq_gl && (seq->scene == scene || have_seq==0)) {
+ if(sequencer_view3d_cb && doseq_gl && (seq->scene == scene || have_seq==0) && seq->scene->camera) {
/* opengl offscreen render */
scene_update_for_newframe(seq->scene, seq->scene->lay);
se->ibuf= sequencer_view3d_cb(seq->scene, seqrectx, seqrecty, scene->r.seq_prev_type);
Modified: branches/render25/source/blender/blenlib/BLI_rect.h
===================================================================
--- branches/render25/source/blender/blenlib/BLI_rect.h 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenlib/BLI_rect.h 2010-06-18 09:45:46 UTC (rev 29542)
@@ -52,6 +52,8 @@
void BLI_init_rcti(struct rcti *rect, int xmin, int xmax, int ymin, int ymax);
void BLI_translate_rctf(struct rctf *rect, float x, float y);
void BLI_translate_rcti(struct rcti *rect, int x, int y);
+void BLI_resize_rcti(struct rcti *rect, int x, int y);
+void BLI_resize_rctf(struct rctf *rect, float x, float y);
int BLI_in_rcti(struct rcti *rect, int x, int y);
int BLI_in_rctf(struct rctf *rect, float x, float y);
int BLI_isect_rctf(struct rctf *src1, struct rctf *src2, struct rctf *dest);
Modified: branches/render25/source/blender/blenlib/BLI_uvproject.h
===================================================================
--- branches/render25/source/blender/blenlib/BLI_uvproject.h 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenlib/BLI_uvproject.h 2010-06-18 09:45:46 UTC (rev 29542)
@@ -37,4 +37,7 @@
/* apply ortho uv's */
void project_from_view_ortho(float target[2], float source[3], float rotmat[4][4]);
+/* so we can adjust scale with keeping the struct private */
+void project_camera_info_scale(struct UvCameraInfo *uci, float scale_x, float scale_y);
+
#endif
Modified: branches/render25/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/path_util.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenlib/intern/path_util.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -703,7 +703,7 @@
}
-/* copy di to fi, filename only */
+/* 'di's filename component is moved into 'fi', di is made a dir path */
void BLI_splitdirstring(char *di, char *fi)
{
char *lslash= BLI_last_slash(di);
@@ -1010,8 +1010,8 @@
void BLI_make_existing_file(char *name)
{
- char di[FILE_MAXDIR], fi[FILE_MAXFILE];
-
+ char di[FILE_MAXDIR+FILE_MAXFILE], fi[FILE_MAXFILE];
+
strcpy(di, name);
BLI_splitdirstring(di, fi);
Modified: branches/render25/source/blender/blenlib/intern/rct.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/rct.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenlib/intern/rct.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -142,6 +142,27 @@
rect->ymax += y;
}
+/* change width & height around the central location */
+void BLI_resize_rcti(rcti *rect, int x, int y)
+{
+ rect->xmin= rect->xmax= (rect->xmax + rect->xmin) / 2;
+ rect->ymin= rect->ymax= (rect->ymax + rect->ymin) / 2;
+ rect->xmin -= x / 2;
+ rect->ymin -= y / 2;
+ rect->xmax= rect->xmin + x;
+ rect->ymax= rect->ymin + y;
+}
+
+void BLI_resize_rctf(rctf *rect, float x, float y)
+{
+ rect->xmin= rect->xmax= (rect->xmax + rect->xmin) * 0.5f;
+ rect->ymin= rect->ymax= (rect->ymax + rect->ymin) * 0.5f;
+ rect->xmin -= x * 0.5f;
+ rect->ymin -= y * 0.5f;
+ rect->xmax= rect->xmin + x;
+ rect->ymax= rect->ymin + y;
+}
+
int BLI_isect_rctf(rctf *src1, rctf *src2, rctf *dest)
{
float xmin, xmax;
Modified: branches/render25/source/blender/blenlib/intern/uvproject.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/uvproject.c 2010-06-18 09:44:02 UTC (rev 29541)
+++ branches/render25/source/blender/blenlib/intern/uvproject.c 2010-06-18 09:45:46 UTC (rev 29542)
@@ -182,3 +182,10 @@
target[0] = -pv[0];
target[1] = pv[2];
}
+
+
+void project_camera_info_scale(UvCameraInfo *uci, float scale_x, float scale_y)
+{
+ uci->xasp *= scale_x;
+ uci->yasp *= scale_y;
+}
Modified: branches/render25/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- branches/render25/source/blender/editors/animation/anim_channels_defines.c 2010-06-18 09:44:02 UTC (rev 29541)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list