Revision: 28065
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28065
Author: blendix
Date: 2010-04-07 11:25:53 +0200 (Wed, 07 Apr 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28045:28064
Modified Paths:
--------------
branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/render25/release/scripts/op/image.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/armature/meshlaplacian.c
branches/render25/source/blender/editors/include/ED_util.h
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_intern.h
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_intern.h
branches/render25/source/blender/editors/space_view3d/view3d_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_snap.c
branches/render25/source/blender/editors/util/ed_util.c
branches/render25/source/blender/makesrna/intern/rna_image.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/render25/source/blender/render/extern/include/RE_shader_ext.h
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/shadeinput.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-04-07
09:07:06 UTC (rev 28064)
+++ branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-04-07
09:25:53 UTC (rev 28065)
@@ -158,11 +158,16 @@
width = tw;
left = rect.left;
}
+ else if(left < rect.left)
+ left = rect.left;
+
if(th < height)
{
height = th;
top = rect.top;
}
+ else if(top > rect.top)
+ top = rect.top;
m_hWnd = ::CreateWindow(
s_windowClassName, // pointer to
registered class name
Modified: branches/render25/release/scripts/op/image.py
===================================================================
--- branches/render25/release/scripts/op/image.py 2010-04-07 09:07:06 UTC
(rev 28064)
+++ branches/render25/release/scripts/op/image.py 2010-04-07 09:25:53 UTC
(rev 28065)
@@ -133,8 +133,10 @@
filename = os.path.splitext(filename)[0]
# filename = bpy.utils.clean_name(filename) # fixes <memory> rubbish,
needs checking
- if filename.startswith("."): # TODO, have a way to check if the file
is saved, assuem .B25.blend
- filename = os.path.join(os.path.dirname(bpy.data.filename),
filename)
+ if filename.startswith(".") or filename == "":
+ # TODO, have a way to check if the file is saved, assume .B25.blend
+ tmpdir = context.user_preferences.filepaths.temporary_directory
+ filename = os.path.join(tmpdir, "project_edit")
else:
filename = "//" + filename
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-04-07
09:07:06 UTC (rev 28064)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-04-07
09:25:53 UTC (rev 28065)
@@ -207,7 +207,6 @@
layout.operator("view3d.snap_selected_to_grid", text="Selection to
Grid")
layout.operator("view3d.snap_selected_to_cursor", text="Selection to
Cursor")
- layout.operator("view3d.snap_selected_to_center", text="Selection to
Origin")
layout.separator()
Modified: branches/render25/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/blender.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/blenkernel/intern/blender.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -287,10 +287,14 @@
if(G.main->versionfile < 250)
do_versions_ipos_to_animato(G.main); // XXX fixme...
complicated versionpatching
- /* in case of autosave or quit.blend, use original filename instead
- * use relbase_valid to make sure the file is saved, else we get
<memory2> in the filename */
- if(recover && bfd->filename[0] && G.relbase_valid)
+ if(recover && bfd->filename[0] && G.relbase_valid) {
+ /* in case of autosave or quit.blend, use original filename
instead
+ * use relbase_valid to make sure the file is saved, else we
get <memory2> in the filename */
filename= bfd->filename;
+ } else if (!G.relbase_valid) {
+ /* otherwise, use an empty string as filename, rather than
<memory2> */
+ filename="";
+ }
/* these are the same at times, should never copy to the same location
*/
if(G.sce != filename)
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/blenloader/intern/readfile.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -3887,9 +3887,6 @@
/* weak weak... this was only meant as draw flag, now is used in
give_base too */
ob->flag &= ~OB_FROMGROUP;
- /* editmode doesn't get saved in files, so should get cleared when
reloading... */
- ob->mode &= ~(OB_MODE_EDIT|OB_MODE_PARTICLE_EDIT);
-
ob->disp.first=ob->disp.last= NULL;
ob->adt= newdataadr(fd, ob->adt);
Modified: branches/render25/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- branches/render25/source/blender/editors/armature/meshlaplacian.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/armature/meshlaplacian.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -523,10 +523,8 @@
/* compute H entry */
if(numclosest > 0) {
- if(mindist > 1e-5)
- h= numclosest*C_WEIGHT/(mindist*mindist);
- else
- h= 1e10f;
+ mindist= maxf(mindist, 1e-4f);
+ h= numclosest*C_WEIGHT/(mindist*mindist);
}
else
h= 0.0f;
Modified: branches/render25/source/blender/editors/include/ED_util.h
===================================================================
--- branches/render25/source/blender/editors/include/ED_util.h 2010-04-07
09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/include/ED_util.h 2010-04-07
09:25:53 UTC (rev 28065)
@@ -37,6 +37,7 @@
/* ed_util.c */
+void ED_editors_init (struct bContext *C);
void ED_editors_exit (struct bContext *C);
/* ************** Undo ************************ */
Modified: branches/render25/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/render25/source/blender/editors/mesh/editmesh_tools.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/mesh/editmesh_tools.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -3656,10 +3656,10 @@
newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1],
p[1][2], 4+p[0][1], -1);
}
else if(fac1 == 4 && fac2 == 3) {
- if(dir == DIRECTION_CW) {
+ if(dir == DIRECTION_CCW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][1], p[0][2], p[0][3], 4+p[1][1]);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
p[1][1], p[1][2], 4+p[0][1], -1);
- } else if (dir == DIRECTION_CCW) {
+ } else if (dir == DIRECTION_CW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][2], 4+p[1][1], p[0][0], p[0][1]);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
4+p[0][2], p[1][0], p[1][1], -1);
@@ -3668,10 +3668,10 @@
}
}
else if(fac1 == 3 && fac2 == 4) {
- if(dir == DIRECTION_CW) {
+ if(dir == DIRECTION_CCW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][1], p[0][2], 4+p[1][1], -1);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
p[1][1], p[1][2], p[1][3], 4+p[0][1]);
- } else if (dir == DIRECTION_CCW) {
+ } else if (dir == DIRECTION_CW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][0], p[0][1], 4+p[1][2], -1);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
p[1][1], p[1][2], 4+p[0][1], 4+p[0][2]);
@@ -3681,10 +3681,10 @@
}
else if(fac1 == 4 && fac2 == 4) {
- if(dir == DIRECTION_CW) {
+ if(dir == DIRECTION_CCW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][1], p[0][2], p[0][3], 4+p[1][1]);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
p[1][1], p[1][2], p[1][3], 4+p[0][1]);
- } else if (dir == DIRECTION_CCW) {
+ } else if (dir == DIRECTION_CW) {
newFace[0]= EM_face_from_faces(em, face[0], face[1],
p[0][2], p[0][3], 4+p[1][1], 4+p[1][2]);
newFace[1]= EM_face_from_faces(em, face[1], face[0],
p[1][2], p[1][3], 4+p[0][1], 4+p[0][2]);
@@ -3695,7 +3695,7 @@
else
return; /* This should never happen */
- if(dir == DIRECTION_CW || (fac1 == 3 && fac2 == 3)) {
+ if(dir == DIRECTION_CCW || (fac1 == 3 && fac2 == 3)) {
verts[0][p[0][1]]->f |= SELECT;
verts[1][p[1][1]]->f |= SELECT;
}
Modified: branches/render25/source/blender/editors/object/object_edit.c
===================================================================
--- branches/render25/source/blender/editors/object/object_edit.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/object/object_edit.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -2054,6 +2054,8 @@
WM_operator_name_call(C, "PARTICLE_OT_particle_edit_toggle",
WM_OP_EXEC_REGION_WIN, NULL);
if(mode & OB_MODE_POSE)
WM_operator_name_call(C, "OBJECT_OT_posemode_toggle",
WM_OP_EXEC_REGION_WIN, NULL);
+ if(mode & OB_MODE_EDIT)
+ WM_operator_name_call(C, "OBJECT_OT_editmode_toggle",
WM_OP_EXEC_REGION_WIN, NULL);
}
/************************ Game Properties ***********************/
Modified: branches/render25/source/blender/editors/render/render_shading.c
===================================================================
--- branches/render25/source/blender/editors/render/render_shading.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/render/render_shading.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -196,6 +196,19 @@
GPU_material_free(ma);
}
+static void image_changed(Main *bmain, Image *ima)
+{
+ Tex *tex;
+
+ /* icons */
+ BKE_icon_changed(BKE_icon_getid(&ima->id));
+
+ /* textures */
+ for(tex=bmain->tex.first; tex; tex=tex->id.next)
+ if(tex->ima == ima)
+ texture_changed(bmain, tex);
+}
+
void ED_render_id_flush_update(Main *bmain, ID *id)
{
if(!id)
@@ -214,6 +227,9 @@
case ID_LA:
lamp_changed(bmain, (Lamp*)id);
break;
+ case ID_IM:
+ image_changed(bmain, (Image*)id);
+ break;
default:
break;
}
Modified: branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -1123,8 +1123,6 @@
/* for switching to/from mode */
static int paint_poll_test(bContext *C)
{
- if(ED_operator_view3d_active(C)==0)
- return 0;
if(CTX_data_edit_object(C))
return 0;
if(CTX_data_active_object(C)==NULL)
Modified: branches/render25/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- branches/render25/source/blender/editors/space_buttons/space_buttons.c
2010-04-07 09:07:06 UTC (rev 28064)
+++ branches/render25/source/blender/editors/space_buttons/space_buttons.c
2010-04-07 09:25:53 UTC (rev 28065)
@@ -341,6 +341,7 @@
sbuts->preview= 1;
break;
case NC_TEXTURE:
+ case NC_IMAGE:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
