[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36560] branches/bmesh/blender/source/ blender: moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes.
Revision: 36560 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36560 Author: campbellbarton Date: 2011-05-09 06:53:39 + (Mon, 09 May 2011) Log Message: --- moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes. Modified Paths: -- branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c branches/bmesh/blender/source/blender/blenkernel/intern/anim.c branches/bmesh/blender/source/blender/blenkernel/intern/armature.c branches/bmesh/blender/source/blender/blenkernel/intern/blender.c branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c branches/bmesh/blender/source/blender/blenkernel/intern/font.c branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c branches/bmesh/blender/source/blender/blenkernel/intern/key.c branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/node.c branches/bmesh/blender/source/blender/blenkernel/intern/sca.c branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c branches/bmesh/blender/source/blender/blenkernel/intern/sound.c branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c branches/bmesh/blender/source/blender/blenlib/intern/rct.c branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2011-05-09 06:53:39 UTC (rev 36560) @@ -45,7 +45,6 @@ #include DNA_object_types.h #include BLI_math.h -#include BLI_cellalloc.h #include BLI_utildefines.h #include BKE_bmesh.h Modified: branches/bmesh/blender/source/blender/blenkernel/intern/anim.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-05-09 06:53:39 UTC (rev 36560) @@ -52,8 +52,6 @@ #include DNA_key_types.h #include DNA_meshdata_types.h #include DNA_scene_types.h -#include DNA_windowmanager_types.h -#include DNA_view3d_types.h #include DNA_vfont_types.h #include BKE_animsys.h Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2011-05-09 06:53:39 UTC (rev 36560) @@ -41,7 +41,6 @@ #include BLI_math.h #include BLI_blenlib.h -#include BLI_cellalloc.h #include BLI_utildefines.h #include DNA_anim_types.h Modified: branches/bmesh/blender/source/blender/blenkernel/intern/blender.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/blender.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/blender.c 2011-05-09 06:53:39 UTC (rev 36560) @@ -456,8 +456,6 @@ BLI_strncpy(mainstr, G.main-name, sizeof(mainstr));/* temporal store */ - strcpy(mainstr, G.main-name); /* temporal store */ - fileflags= G.fileflags; G.fileflags |= G_FILE_NO_UI; Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-09 06:53:39 UTC (rev 36560) @@ -44,7 +44,6 @@ #include BLI_listbase.h #include BLI_math.h #include BLI_editVert.h -#include BLI_cellalloc.h #include BLI_utildefines.h #include DNA_armature_types.h Modified: branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c 2011-05-09 05:55:41 UTC (rev 36559) +++ branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36561] branches/bmesh/blender: set the property on text files to native eol.
Revision: 36561 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36561 Author: campbellbarton Date: 2011-05-09 07:48:16 + (Mon, 09 May 2011) Log Message: --- set the property on text files to native eol. for x in `find . -name '*.c*'`; do svn propset svn:eol-style native $x; done for x in `find . -name '*.h'`; do svn propset svn:eol-style native $x; done Modified Paths: -- branches/bmesh/blender/intern/smoke/intern/Makefile.cygwin branches/bmesh/blender/intern/smoke/intern/main.cpp.back branches/bmesh/blender/source/blender/blenkernel/BKE_idcode.h branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_selecthistory.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c Property Changed: branches/bmesh/blender/build_files/buildbot/master.cfg branches/bmesh/blender/doc/python_api/blender-org/static/default.css_t branches/bmesh/blender/doc/python_api/blender-org/theme.conf branches/bmesh/blender/intern/ghost/intern/GHOST_EventTrackpad.h branches/bmesh/blender/intern/guardedalloc/intern/mmap_win.c branches/bmesh/blender/intern/smoke/intern/Makefile.cygwin branches/bmesh/blender/intern/smoke/intern/main.cpp.back branches/bmesh/blender/source/blender/blenkernel/BKE_idcode.h branches/bmesh/blender/source/blender/blenkernel/BKE_tessmesh.h branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c branches/bmesh/blender/source/blender/blenlib/BLI_smallhash.h branches/bmesh/blender/source/blender/blenlib/BLI_sparsemap.h branches/bmesh/blender/source/blender/bmesh/bmesh_class.h branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_private.h branches/bmesh/blender/source/blender/bmesh/operators/bevel.c branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c branches/bmesh/blender/source/blender/editors/include/ED_toolmode.h branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_selecthistory.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c branches/bmesh/blender/source/blender/editors/mesh/knifetool.c branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c branches/bmesh/blender/source/blender/python/BPY_extern.h branches/bmesh/blender/source/blender/python/generic/bgl.c branches/bmesh/blender/source/blender/python/generic/bgl.h branches/bmesh/blender/source/blender/python/intern/bpy_interface.c branches/bmesh/blender/source/blender/python/intern/bpy_operator.c branches/bmesh/blender/source/blender/python/intern/bpy_operator.h branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.c branches/bmesh/blender/source/blender/python/intern/bpy_operator_wrap.h branches/bmesh/blender/source/blender/python/intern/bpy_rna.c branches/bmesh/blender/source/blender/python/intern/bpy_rna.h branches/bmesh/blender/source/blender/python/intern/bpy_util.c branches/bmesh/blender/source/blender/python/intern/bpy_util.h branches/bmesh/blender/source/blender/python/intern/stubs.c Property changes on: branches/bmesh/blender/build_files/buildbot/master.cfg ___ Added:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36563] trunk/blender/source/blender: Code cleanup: warning fixes.
Revision: 36563
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36563
Author: blendix
Date: 2011-05-09 08:01:48 + (Mon, 09 May 2011)
Log Message:
---
Code cleanup: warning fixes.
Modified Paths:
--
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-09 08:01:48 UTC (rev 36563)
@@ -98,19 +98,6 @@
/* proto */
-static void do_image_panel_events(bContext *C, void *UNUSED(arg), int event)
-{
- SpaceImage *sima= CTX_wm_space_image(C);
-
- switch(event) {
- case B_REDR:
- break;
- }
-
- /* all events now */
- WM_event_add_notifier(C, NC_IMAGE, sima-image);
-}
-
static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf
*ibuf, char *str)
{
int ofs= 0;
Modified: trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
===
--- trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2011-05-09 08:01:48 UTC (rev 36563)
@@ -980,7 +980,7 @@
{
if (header.hasDX10Header())
{
-#pragma NV_MESSAGE(TODO: Update hasAlpha to handle all DX10 formats.)
+ /* TODO: Update hasAlpha to handle all DX10 formats. */
return
header.header10.dxgiFormat == DXGI_FORMAT_BC1_UNORM ||
header.header10.dxgiFormat == DXGI_FORMAT_BC2_UNORM ||
Modified: trunk/blender/source/blender/windowmanager/intern/wm_draw.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-05-09
07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-05-09
08:01:48 UTC (rev 36563)
@@ -816,11 +816,3 @@
win-screen-do_draw= 1;
}
-static void wm_draw_region_modified(wmWindow *win, ARegion *ar)
-{
- int drawmethod= wm_automatic_draw_method(win);
-
- if(ELEM(drawmethod, USER_DRAW_OVERLAP, USER_DRAW_OVERLAP_FLIP))
- ED_region_tag_redraw(ar);
-}
-
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-05-09 08:01:48 UTC (rev 36563)
@@ -2035,6 +2035,8 @@
/* *** */
+#if defined(WIN32)
+
static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op))
{
GHOST_toggleConsole(2);
@@ -2051,6 +2053,8 @@
ot-poll= WM_operator_winactive;
}
+#endif
+
/* default paint cursors, draw always around cursor *** */
/*
- returns handler to free
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36564] trunk/blender: set svn end of lines to native
Revision: 36564 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36564 Author: campbellbarton Date: 2011-05-09 08:15:38 + (Mon, 09 May 2011) Log Message: --- set svn end of lines to native Modified Paths: -- trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw trunk/blender/intern/smoke/intern/Makefile.FFT trunk/blender/intern/smoke/intern/Makefile.cygwin trunk/blender/intern/smoke/intern/Makefile.linux trunk/blender/intern/smoke/intern/Makefile.mac trunk/blender/intern/smoke/intern/main.cpp.back trunk/blender/release/environment-mswindows trunk/blender/release/windows/installer/00.sconsblender.nsi trunk/blender/source/darwin/blender.app/Contents/Info.plist trunk/blender/source/darwin/blenderplayer.app/Contents/Info.plist trunk/blender/source/icons/blender.exe.manifest Property Changed: trunk/blender/build_files/buildbot/master.cfg trunk/blender/build_files/package_spec/debian/docs trunk/blender/build_files/package_spec/rpm/blender.spec.in trunk/blender/doc/python_api/blender-org/static/default.css_t trunk/blender/doc/python_api/blender-org/static/jquery.sidebar.js trunk/blender/doc/python_api/blender-org/theme.conf trunk/blender/doc/python_api/sphinx_html_compact.diff trunk/blender/extern/Eigen2/Eigen/SVD trunk/blender/extern/eltopo/common/meshes/Edge.hpp trunk/blender/extern/eltopo/common/meshes/ObjLoader.hpp trunk/blender/extern/eltopo/common/meshes/TriangleIndex.hpp trunk/blender/extern/eltopo/eltopo3d/Makefile.example_defs trunk/blender/extern/eltopo/eltopo3d/Makefile.inc trunk/blender/extern/eltopo/eltopo3d/Makefile.local_defs trunk/blender/extern/glew/ChangeLog trunk/blender/extern/libopenjpeg/patches/fbsd.patch trunk/blender/extern/libredcode/AUTHOR trunk/blender/extern/libredcode/LICENSE trunk/blender/extern/libredcode/NOTES trunk/blender/extern/lzo/minilzo/COPYING trunk/blender/extern/lzo/minilzo/Makefile.bak trunk/blender/extern/lzo/minilzo/README.LZO trunk/blender/intern/audaspace/COPYING trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw trunk/blender/intern/smoke/intern/Makefile.FFT trunk/blender/intern/smoke/intern/Makefile.cygwin trunk/blender/intern/smoke/intern/Makefile.linux trunk/blender/intern/smoke/intern/Makefile.mac trunk/blender/intern/smoke/intern/main.cpp.back trunk/blender/release/environment-macosx trunk/blender/release/environment-mswindows trunk/blender/release/environment-unix trunk/blender/release/freedesktop/blender.desktop trunk/blender/release/windows/installer/00.sconsblender.nsi trunk/blender/scons/scons-LICENSE trunk/blender/scons/scons-README trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Action.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Builder.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/CacheDir.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Conftest.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Debug.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Defaults.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Environment.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Errors.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Executor.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Job.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Memoize.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Node/Alias.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Node/FS.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Node/Python.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Node/__init__.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/BoolOption.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/EnumOption.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/ListOption.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/PackageOption.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/PathOption.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Options/__init__.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/PathList.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Platform/__init__.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Platform/aix.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Platform/cygwin.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Platform/darwin.py trunk/blender/scons/scons-local-1.2.0.d20090223/SCons/Platform/hpux.py
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36565] branches/bmesh/blender: warning fixes
Revision: 36565
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36565
Author: campbellbarton
Date: 2011-05-09 08:20:39 + (Mon, 09 May 2011)
Log Message:
---
warning fixes
Modified Paths:
--
branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/creator/creator.c
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
===
--- branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_EventManager.cpp
2011-05-09 08:20:39 UTC (rev 36565)
@@ -249,7 +249,7 @@
wm = sys-getWindowManager();
windows = wm-getWindows();
- while (str = fgets(buf, 256, m_playfile)) {
+ while ((str = fgets(buf, 256, m_playfile))) {
GHOST_IWindow *iwin = NULL;
GHOST_TEventType type;
double time;
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-05-09 08:20:39 UTC (rev 36565)
@@ -3493,7 +3493,7 @@
memcpy(disp2, mdisps[i].disps,
MEM_allocN_len(mdisps[i].disps));
MEM_freeN(mdisps[i].disps);
- mdisps[i].disps = disp2;
+ mdisps[i].disps = (float (*)[3])disp2;
}
if( (fd-flags FD_FLAGS_SWITCH_ENDIAN)
(mdisps[i].disps) ) {
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
2011-05-09 08:20:39 UTC (rev 36565)
@@ -51,7 +51,7 @@
if (bmesh_check_element(bm, el, ((BMHeader*)el)-type))\
printf(check_element failure, with code %i on line %i in
file\n\%s\\n\n, bmesh_check_element(bm, el, ((BMHeader*)el)-type),
__LINE__, __FILE__);
-#define bm_get_edge_link(e, v) (Link*)((v) == ((BMEdge*)(e))-v1 ?
(((BMEdge*)(e))-dlink1) : (((BMEdge*)(e))-dlink2))
+#define bm_get_edge_link(e, v) (((v) == ((BMEdge*)(e))-v1) ?
(Link*)(((BMEdge*)(e))-dlink1) : (Link*)(((BMEdge*)(e))-dlink2))
int bmesh_radial_length(struct BMLoop *l);
int bmesh_disk_count(BMVert *v);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
2011-05-09 08:15:38 UTC (rev 36564)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
2011-05-09 08:20:39 UTC (rev 36565)
@@ -194,7 +194,7 @@
}
if (v-e == e)
- v-e = e!=e1-next ? (BMEdge*)e1-next : NULL;
+ v-e = (e != (BMEdge *)e1-next) ? (BMEdge *)e1-next : NULL;
e1-next = e1-prev = NULL;
}
Modified: branches/bmesh/blender/source/creator/creator.c
===
--- branches/bmesh/blender/source/creator/creator.c 2011-05-09 08:15:38 UTC
(rev 36564)
+++ branches/bmesh/blender/source/creator/creator.c 2011-05-09 08:20:39 UTC
(rev 36565)
@@ -356,7 +356,7 @@
}
}*/
-int segmentation_handler(int sig)
+void segmentation_handler(int sig)
{
char fname[256];
@@ -372,8 +372,6 @@
/*induce a real crash*/
signal(SIGSEGV, SIG_DFL);
*(int*)NULL = 0;
-
- return 0;
}
static int nocrashhandler(int argc, const char **argv, void *data)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36566] branches/cycles/intern/cycles: Cycles: fix color difference between render / 3d view with color management disabled.
Revision: 36566
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36566
Author: blendix
Date: 2011-05-09 09:03:08 + (Mon, 09 May 2011)
Log Message:
---
Cycles: fix color difference between render / 3d view with color management
disabled.
Modified Paths:
--
branches/cycles/intern/cycles/blender/blender_session.cpp
branches/cycles/intern/cycles/util/util_color.h
Modified: branches/cycles/intern/cycles/blender/blender_session.cpp
===
--- branches/cycles/intern/cycles/blender/blender_session.cpp 2011-05-09
08:20:39 UTC (rev 36565)
+++ branches/cycles/intern/cycles/blender/blender_session.cpp 2011-05-09
09:03:08 UTC (rev 36566)
@@ -130,14 +130,17 @@
vectorfloat4 buffer(width*height);
float fac = 1.0f/255.0f;
+ bool color_management = b_scene.render().use_color_management();
/* normalize */
for(int i = width*height - 1; i = 0; i--) {
uchar4 f = rgba[i];
- float r = color_srgb_to_scene_linear(f.x*fac);
- float g = color_srgb_to_scene_linear(f.y*fac);
- float b = color_srgb_to_scene_linear(f.z*fac);
- buffer[i] = make_float4(r, g, b, 1.0f);
+ float3 rgb = make_float3(f.x, f.y, f.z)*fac;
+
+ if(color_management)
+ rgb = color_srgb_to_scene_linear(rgb);
+
+ buffer[i] = make_float4(rgb.x, rgb.y, rgb.z, 1.0f);
}
struct RenderResult *rrp =
RE_engine_begin_result((RenderEngine*)b_engine.ptr.data, 0, 0, width, height);
Modified: branches/cycles/intern/cycles/util/util_color.h
===
--- branches/cycles/intern/cycles/util/util_color.h 2011-05-09 08:20:39 UTC
(rev 36565)
+++ branches/cycles/intern/cycles/util/util_color.h 2011-05-09 09:03:08 UTC
(rev 36566)
@@ -40,6 +40,22 @@
return 1.055f * pow(c, 1.0f/2.4f) - 0.055f;
}
+__device float3 color_srgb_to_scene_linear(float3 c)
+{
+ return make_float3(
+ color_srgb_to_scene_linear(c.x),
+ color_srgb_to_scene_linear(c.y),
+ color_srgb_to_scene_linear(c.z));
+}
+
+__device float3 color_scene_linear_to_srgb(float3 c)
+{
+ return make_float3(
+ color_scene_linear_to_srgb(c.x),
+ color_scene_linear_to_srgb(c.y),
+ color_scene_linear_to_srgb(c.z));
+}
+
CCL_NAMESPACE_END
#endif /* __UTIL_COLOR_H__ */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36567] branches/particles-2010/source/ blender/blenkernel/intern/texture.c: Clearing the execdata pointer is done automatically in begin/end function
Revision: 36567
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36567
Author: lukastoenne
Date: 2011-05-09 09:17:35 + (Mon, 09 May 2011)
Log Message:
---
Clearing the execdata pointer is done automatically in begin/end functions.
Modified Paths:
--
branches/particles-2010/source/blender/blenkernel/intern/texture.c
Modified: branches/particles-2010/source/blender/blenkernel/intern/texture.c
===
--- branches/particles-2010/source/blender/blenkernel/intern/texture.c
2011-05-09 09:03:08 UTC (rev 36566)
+++ branches/particles-2010/source/blender/blenkernel/intern/texture.c
2011-05-09 09:17:35 UTC (rev 36567)
@@ -769,7 +769,6 @@
if(tex-nodetree) {
if (tex-nodetree-execdata) {
ntreeTexEndExecTree(tex-nodetree-execdata);
- tex-nodetree-execdata = NULL;
}
texn-nodetree= ntreeCopyTree(tex-nodetree);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36568] branches/bmesh/blender: svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36568 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36568 Author: campbellbarton Date: 2011-05-09 09:38:48 + (Mon, 09 May 2011) Log Message: --- svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36529 Modified Paths: -- branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp branches/bmesh/blender/intern/smoke/intern/Makefile.FFT branches/bmesh/blender/intern/smoke/intern/Makefile.linux branches/bmesh/blender/intern/smoke/intern/Makefile.mac branches/bmesh/blender/release/environment-mswindows branches/bmesh/blender/release/scripts/modules/bpy/utils.py branches/bmesh/blender/release/scripts/modules/io_utils.py branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py branches/bmesh/blender/release/windows/installer/00.sconsblender.nsi branches/bmesh/blender/source/blender/blenkernel/BKE_text.h branches/bmesh/blender/source/blender/blenkernel/intern/text.c branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c branches/bmesh/blender/source/blender/editors/animation/anim_filter.c branches/bmesh/blender/source/blender/editors/space_image/CMakeLists.txt branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c branches/bmesh/blender/source/blender/editors/space_image/image_ops.c branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c branches/bmesh/blender/source/blender/editors/space_text/text_draw.c branches/bmesh/blender/source/blender/editors/space_text/text_ops.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c branches/bmesh/blender/source/blender/imbuf/intern/dds/BlockDXT.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/BlockDXT.h branches/bmesh/blender/source/blender/imbuf/intern/dds/Color.h branches/bmesh/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/ColorBlock.h branches/bmesh/blender/source/blender/imbuf/intern/dds/Common.h branches/bmesh/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h branches/bmesh/blender/source/blender/imbuf/intern/dds/Image.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/Image.h branches/bmesh/blender/source/blender/imbuf/intern/dds/PixelFormat.h branches/bmesh/blender/source/blender/imbuf/intern/dds/Stream.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/Stream.h branches/bmesh/blender/source/blender/imbuf/intern/dds/dds_api.cpp branches/bmesh/blender/source/blender/imbuf/intern/dds/dds_api.h branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh_api.c branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c branches/bmesh/blender/source/blender/makesrna/intern/rna_wm_api.c branches/bmesh/blender/source/blender/modifiers/intern/MOD_warp.c branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c branches/bmesh/blender/source/blender/render/intern/source/rayshade.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c branches/bmesh/blender/source/darwin/blender.app/Contents/Info.plist branches/bmesh/blender/source/darwin/blenderplayer.app/Contents/Info.plist branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/bmesh/blender/source/icons/blender.exe.manifest Removed Paths: - branches/bmesh/blender/source/blender/editors/space_image/image_render.c Property Changed: branches/bmesh/blender/ branches/bmesh/blender/build_files/package_spec/debian/docs branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in branches/bmesh/blender/doc/python_api/blender-org/static/jquery.sidebar.js
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36569] trunk/blender/source/blender/imbuf /intern/filter.c: Fix for memory leak caused by re-making mipmaps
Revision: 36569 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36569 Author: nazgul Date: 2011-05-09 10:03:06 + (Mon, 09 May 2011) Log Message: --- Fix for memory leak caused by re-making mipmaps Problem was caused by different limits for last mipmap: it was 1x1 for mkaing mipmaps and 2x2 for re-making. 2x2 should be enough for mipmap. Modified Paths: -- trunk/blender/source/blender/imbuf/intern/filter.c Modified: trunk/blender/source/blender/imbuf/intern/filter.c === --- trunk/blender/source/blender/imbuf/intern/filter.c 2011-05-09 09:38:48 UTC (rev 36568) +++ trunk/blender/source/blender/imbuf/intern/filter.c 2011-05-09 10:03:06 UTC (rev 36569) @@ -437,7 +437,7 @@ hbuf= ibuf-mipmap[curmap]; hbuf-miplevel= curmap+1; - if(!hbuf || (hbuf-x == 1 hbuf-y == 1)) + if(!hbuf || (hbuf-x = 2 hbuf-y = 2)) break; curmap++; ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36570] branches/cycles/source/blender/ editors/interface/interface_node.c: Cycles: fix crash when drawing properties UI while editing node links.
Revision: 36570
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36570
Author: blendix
Date: 2011-05-09 10:40:53 + (Mon, 09 May 2011)
Log Message:
---
Cycles: fix crash when drawing properties UI while editing node links.
Modified Paths:
--
branches/cycles/source/blender/editors/interface/interface_node.c
Modified: branches/cycles/source/blender/editors/interface/interface_node.c
===
--- branches/cycles/source/blender/editors/interface/interface_node.c
2011-05-09 10:03:06 UTC (rev 36569)
+++ branches/cycles/source/blender/editors/interface/interface_node.c
2011-05-09 10:40:53 UTC (rev 36570)
@@ -74,7 +74,7 @@
{
bNodeSocket *input;
- if(node-flag NODE_TEST)
+ if(!node || (node-flag NODE_TEST))
return; /* in case of cycles */
node-flag |= NODE_TEST;
@@ -88,7 +88,7 @@
{
bNodeSocket *input;
- if(!(node-flag NODE_TEST))
+ if(!node || !(node-flag NODE_TEST))
return; /* in case of cycles */
node-flag = ~NODE_TEST;
@@ -115,6 +115,9 @@
bNode *node, *next;
bNodeSocket *sock;
+ if(!node)
+ return;
+
/* tag linked nodes to be removed */
for(node=ntree-nodes.first; node; node=node-next)
node-flag = ~NODE_TEST;
@@ -144,7 +147,7 @@
static void ui_node_sock_name(bNodeSocket *sock, char name[UI_MAX_NAME_STR])
{
- if(sock-link) {
+ if(sock-link sock-link-fromnode) {
bNode *node = sock-link-fromnode;
if(node-type == NODE_GROUP)
@@ -229,7 +232,7 @@
if(strcmp(sock_prev-name,
sock_from-name) == 0 sock_prev-type == sock_from-type) {
bNodeLink *link =
sock_prev-link;
- if(link) {
+ if(link link-fromnode) {
nodeAddLink(ntree,
link-fromnode, link-fromsock, node_from, sock_from);
nodeRemLink(ntree,
link);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36571] branches/cycles: Cycles: different fix for animation render, in render API instead of python script .
Revision: 36571 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36571 Author: blendix Date: 2011-05-09 10:43:09 + (Mon, 09 May 2011) Log Message: --- Cycles: different fix for animation render, in render API instead of python script. Modified Paths: -- branches/cycles/intern/cycles/blender/addon/__init__.py branches/cycles/source/blender/render/intern/pipeline/engine.c Modified: branches/cycles/intern/cycles/blender/addon/__init__.py === --- branches/cycles/intern/cycles/blender/addon/__init__.py 2011-05-09 10:40:53 UTC (rev 36570) +++ branches/cycles/intern/cycles/blender/addon/__init__.py 2011-05-09 10:43:09 UTC (rev 36571) @@ -48,7 +48,6 @@ engine.free(self) def render(self, scene): - scene.frame_set(scene.frame_current) # should this be done already? engine.create(self, scene, True) engine.render(self, scene) Modified: branches/cycles/source/blender/render/intern/pipeline/engine.c === --- branches/cycles/source/blender/render/intern/pipeline/engine.c 2011-05-09 10:40:53 UTC (rev 36570) +++ branches/cycles/source/blender/render/intern/pipeline/engine.c 2011-05-09 10:43:09 UTC (rev 36571) @@ -41,6 +41,7 @@ #include BLI_utildefines.h #include BKE_report.h +#include BKE_scene.h #include IMB_imbuf.h #include IMB_imbuf_types.h @@ -194,6 +195,9 @@ engine = RE_engine_create(type); engine-re= re; + if((re-r.scemode (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0) + scene_update_for_newframe(re-main, re-scene, re-lay); + type-render(engine, re-scene); free_render_result(engine-fullresult, engine-fullresult.first); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36572] branches/cycles/source/blender/ nodes/intern/SHD_nodes: Cycles: fix node outputs not connect to more than one input.
Revision: 36572
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36572
Author: blendix
Date: 2011-05-09 11:02:04 + (Mon, 09 May 2011)
Log Message:
---
Cycles: fix node outputs not connect to more than one input.
Modified Paths:
--
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_emission.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
===
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -38,7 +38,7 @@
};
static bNodeSocketType sh_node_add_closure_out[]= {
- { SOCK_CLOSURE, 1, Closure, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, Closure, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0,}
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
===
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -32,7 +32,7 @@
/* OUTPUT */
static bNodeSocketType sh_node_attribute_out[]= {
- { SOCK_VECTOR, 1, Vector, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_VECTOR, 0, Vector, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0,}
};
Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
===
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
2011-05-09 10:43:09 UTC (rev 36571)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_background.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -38,7 +38,7 @@
};
static bNodeSocketType sh_node_background_out[]= {
- { SOCK_CLOSURE, 1, Background, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
+ { SOCK_CLOSURE, 0, Background, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f},
{ -1, 0,}
};
Modified:
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
===
---
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
2011-05-09 10:43:09 UTC (rev 36571)
+++
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c
2011-05-09 11:02:04 UTC (rev 36572)
@@ -39,7 +39,7 @@
};
static bNodeSocketType
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36573] trunk/blender/intern/ghost/intern/ GHOST_SystemX11.cpp: fixed scrolling lists with the mousewheel for some X11 windowmanagers.
Revision: 36573
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36573
Author: lmg
Date: 2011-05-09 12:46:59 + (Mon, 09 May 2011)
Log Message:
---
fixed scrolling lists with the mousewheel for some X11 windowmanagers.
some WMs not only send 'crossing' events when really moving from one
window to another, but also when mousewheeling.
distinguishing those events 'mode' property fixed this.
brecht++ for figuring out the details.
Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-05-09
11:02:04 UTC (rev 36572)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-05-09
12:46:59 UTC (rev 36573)
@@ -700,19 +700,24 @@
case EnterNotify:
case LeaveNotify:
{
- // XCrossingEvents pointer leave enter window.
- // also do cursor move here, MotionNotify only
- // happens when motion starts ends inside window
+ /* XCrossingEvents pointer leave enter window.
+ also do cursor move here, MotionNotify only
+ happens when motion starts ends inside window.
+ we only do moves when the crossing mode is 'normal'
+ (really crossing between windows) since some
windowmanagers
+ also send grab/ungrab crossings for mousewheel
events.
+ */
XCrossingEvent xce = xe-xcrossing;
-
- g_event = new
- GHOST_EventCursor(
- getMilliSeconds(),
- GHOST_kEventCursorMove,
- window,
- xce.x_root,
- xce.y_root
- );
+ if( xce.mode == NotifyNormal ) {
+ g_event = new
+ GHOST_EventCursor(
+ getMilliSeconds(),
+ GHOST_kEventCursorMove,
+ window,
+ xce.x_root,
+ xce.y_root
+ );
+ }
break;
}
case MapNotify:
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36574] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: Recreate mipmaps after undo in image editor
Revision: 36574 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36574 Author: nazgul Date: 2011-05-09 13:13:16 + (Mon, 09 May 2011) Log Message: --- Recreate mipmaps after undo in image editor Modified Paths: -- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c === --- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2011-05-09 12:46:59 UTC (rev 36573) +++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2011-05-09 13:13:16 UTC (rev 36574) @@ -440,6 +440,8 @@ GPU_free_image(ima); /* force OpenGL reload */ if(ibuf-rect_float) ibuf-userflags |= IB_RECT_INVALID; /* force recreate of char rect */ + if(ibuf-mipmap[0]) + ibuf-userflags |= IB_MIPMAP_INVALID; /* force mipmap recreatiom */ } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36575] branches/bmesh/blender/source: tag unused arguments, quiet some warnings
Revision: 36575
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36575
Author: campbellbarton
Date: 2011-05-09 14:32:55 + (Mon, 09 May 2011)
Log Message:
---
tag unused arguments, quiet some warnings
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.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/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
branches/bmesh/blender/source/blender/editors/object/object_lattice.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_toolbar.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_array.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/creator/creator.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-05-09 14:32:55 UTC (rev 36575)
@@ -1023,7 +1023,7 @@
}
}
-static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *ob)
+static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *UNUSED(ob))
{
KeyBlock *kb;
Key *key = me-key;
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-05-09 14:32:55 UTC (rev 36575)
@@ -1865,7 +1865,7 @@
}
}
-DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *me, int use_mdisps)
+DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int
use_mdisps)
{
DerivedMesh *dm = CDDM_new(em-bm-totvert, em-bm-totedge,
em-tottri, em-bm-totloop, em-bm-totface);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/context.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2011-05-09 13:13:16 UTC (rev 36574)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2011-05-09 14:32:55 UTC (rev 36575)
@@ -44,6 +44,7 @@
#include RNA_access.h
+#include BLI_utildefines.h
#include BLI_listbase.h
#include BLI_string.h
#include PIL_time.h
@@ -122,7 +123,7 @@
#if defined(EVENT_RECORDER) !defined(BUILDING_GAMEPLAYER)
extern GHOST_SystemHandle g_system;
-int CTX_rec_events(bContext *C)
+int CTX_rec_events(bContext *UNUSED(C))
{
return GHOST_RecordingEvents(g_system);
}
@@ -139,7 +140,7 @@
return 1;
}
-FILE *CTX_rec_file(bContext *C)
+FILE *CTX_rec_file(bContext
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36576] trunk/blender: minor cleanup, no functional changes.
Revision: 36576
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36576
Author: campbellbarton
Date: 2011-05-09 14:41:44 + (Mon, 09 May 2011)
Log Message:
---
minor cleanup, no functional changes.
Modified Paths:
--
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===
--- trunk/blender/CMakeLists.txt2011-05-09 14:32:55 UTC (rev 36575)
+++ trunk/blender/CMakeLists.txt2011-05-09 14:41:44 UTC (rev 36576)
@@ -870,7 +870,7 @@
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
-
+
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev
36575)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev
36576)
@@ -29,7 +29,7 @@
../string
../../source/blender/imbuf
../../source/blender/makesdna
-${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/CMakeLists.txt
===
--- trunk/blender/source/blender/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev
36575)
+++ trunk/blender/source/blender/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev
36576)
@@ -123,6 +123,5 @@
endif()
if(WITH_OPENCOLLADA)
- add_subdirectory(collada)
+ add_subdirectory(collada)
endif()
-
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===
--- trunk/blender/source/blender/blenfont/CMakeLists.txt2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt2011-05-09
14:41:44 UTC (rev 36576)
@@ -29,7 +29,7 @@
../editors/include
../blenkernel
../../../intern/guardedalloc
-${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
${FREETYPE_INCLUDE_DIRS}
)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -53,7 +53,7 @@
../../../intern/opennl/extern
../../../intern/smoke/extern
../../../intern/mikktspace
-../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+ ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
${GLEW_INCLUDE_PATH}
${ZLIB_INCLUDE_DIRS}
)
@@ -314,7 +314,7 @@
endif()
if(MSVC)
-set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} /WX)
+ set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} /WX)
endif()
blender_add_lib(bf_blenkernel ${SRC} ${INC})
Modified: trunk/blender/source/blender/editors/include/ED_image.h
===
--- trunk/blender/source/blender/editors/include/ED_image.h 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/editors/include/ED_image.h 2011-05-09
14:41:44 UTC (rev 36576)
@@ -68,8 +68,5 @@
/* UI level image (texture) updating... render calls own stuff (too) */
void ED_image_update_frame(const struct Main *mainp, int cfra);
-/* image_render.c, export for screen_ops.c, render operator */
-void ED_space_image_output(struct bContext *C);
-
#endif /* ED_IMAGE_H */
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -32,7 +32,7 @@
../../render/extern/include
../../windowmanager
../../../../intern/guardedalloc
-${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/gpu/CMakeLists.txt
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36577] trunk/blender: patch [#21740] Image support for Empty Objects
Revision: 36577
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36577
Author: campbellbarton
Date: 2011-05-09 16:31:54 + (Mon, 09 May 2011)
Log Message:
---
patch [#21740] Image support for Empty Objects
from Andy Braham (andybraham)
This adds support for empties to reference images and draw in the 3D view.
Modifications from the original patch.
- use an empty draw 'image' type
- use image aspect ratio for non-square-pixels
- when the image is not found, still draw the frame.
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
2011-05-09 14:41:44 UTC (rev 36576)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py
2011-05-09 16:31:54 UTC (rev 36577)
@@ -39,6 +39,17 @@
ob = context.object
layout.prop(ob, empty_draw_type, text=Display)
+
+if ob.empty_draw_type == 'IMAGE':
+# layout.template_image(ob, data, None)
+layout.template_ID(ob, data, open=image.open,
unlink=image.unlink)
+
+row = layout.row(align = True)
+row.prop(ob, color, text=Transparency, index=3, slider=True)
+row = layout.row(align = True)
+row.prop(ob, empty_image_offset, text=Offset X, index=0)
+row.prop(ob, empty_image_offset, text=Offset Y, index=1)
+
layout.prop(ob, empty_draw_size, text=Size)
if __name__ == __main__: # only for live edit.
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2011-05-09 14:41:44 UTC (rev 36576)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2011-05-09 16:31:54 UTC (rev 36577)
@@ -46,6 +46,7 @@
#include DNA_scene_types.h
#include DNA_smoke_types.h
#include DNA_world_types.h
+#include DNA_armature_types.h
#include BLI_blenlib.h
#include BLI_math.h
@@ -76,6 +77,9 @@
#include smoke_API.h
+#include IMB_imbuf.h
+#include IMB_imbuf_types.h
+
#include BIF_gl.h
#include BIF_glutil.h
@@ -515,6 +519,96 @@
}
}
+
+/* Function to draw an Image on a empty Object */
+static void draw_empty_image(Object *ob)
+{
+ Image *ima = (Image*)ob-data;
+ ImBuf *ibuf = ima ? BKE_image_get_ibuf(ima, NULL) : NULL;
+
+ float scale, ofs_x, ofs_y, sca_x, sca_y;
+ int ima_x, ima_y;
+
+ if(ibuf (ibuf-rect == NULL) (ibuf-rect_float != NULL)) {
+ IMB_rect_from_float(ibuf);
+ }
+
+ /* Get the buffer dimensions so we can fallback to fake ones */
+ if(ibuf ibuf-rect) {
+ ima_x= ibuf-x;
+ ima_y= ibuf-y;
+ }
+ else {
+ ima_x= 1;
+ ima_y= 1;
+ }
+
+ /* Get the image aspect even if the buffer is invalid */
+ if(ima) {
+ if(ima-aspx ima-aspy) {
+ sca_x= 1.0f;
+ sca_y= ima-aspy / ima-aspx;
+ }
+ else if(ima-aspx ima-aspy) {
+ sca_x= ima-aspx / ima-aspy;
+ sca_y= 1.0f;
+ }
+ else {
+ sca_x= 1.0f;
+ sca_y= 1.0f;
+ }
+ }
+ else {
+ sca_x= 1.0f;
+ sca_y= 1.0f;
+ }
+
+ /* Calculate the scale center based on objects origin */
+ ofs_x= ob-ima_ofs[0] * ima_x;
+ ofs_y= ob-ima_ofs[1] * ima_y;
+
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+
+ /* Make sure we are drawing at the origin */
+ glTranslatef(0.0f, 0.0f, 0.0f);
+
+ /* Calculate Image scale */
+ scale= (ob-empty_drawsize / (float)MAX2(ima_x * sca_x, ima_y * sca_y));
+
+ /* Set the object scale */
+ glScalef(scale * sca_x, scale * sca_y, 1.0f);
+
+ if(ibuf ibuf-rect) {
+ /* Setup GL params */
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ /* Use the object color and alpha */
+ glColor4fv(ob-col);
+
+ /* Draw the Image on the screen */
+ glaDrawPixelsTex(ofs_x, ofs_y, ima_x, ima_y, GL_UNSIGNED_BYTE,
ibuf-rect);
+ glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
+
+ glDisable(GL_BLEND);
+ }
+
+ UI_ThemeColor((ob-flag
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36578] trunk/blender/intern: SVN maintenance.
Revision: 36578 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36578 Author: gsrb3d Date: 2011-05-09 20:13:48 + (Mon, 09 May 2011) Log Message: --- SVN maintenance. Modified Paths: -- trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw Added Paths: --- trunk/blender/intern/smoke/intern/original-main.cpp Removed Paths: - trunk/blender/intern/smoke/intern/main.cpp.back Property Changed: trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw Modified: trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp === --- trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp 2011-05-09 16:31:54 UTC (rev 36577) +++ trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp 2011-05-09 20:13:48 UTC (rev 36578) @@ -1,126 +1,126 @@ -# Microsoft Developer Studio Project File - Name=BSP_GhostTest - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Console Application 0x0103 - -CFG=BSP_GhostTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f BSP_GhostTest.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f BSP_GhostTest.mak CFG=BSP_GhostTest - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE BSP_GhostTest - Win32 Release (based on Win32 (x86) Console Application) -!MESSAGE BSP_GhostTest - Win32 Debug (based on Win32 (x86) Console Application) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName -# PROP Scc_LocalPath -CPP=cl.exe -RSC=rc.exe - -!IF $(CFG) == BSP_GhostTest - Win32 Release - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir Release -# PROP BASE Intermediate_Dir Release -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir Release -# PROP Intermediate_Dir Release -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir -# ADD BASE CPP /nologo /W3 /GX /O2 /D WIN32 /D NDEBUG /D _CONSOLE /D _MBCS /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I ../../extern/ /I ../../../../lib/windows/string/include /I ../../../../lib/windows/ghost/include /I ../../../../lib/windows/moto/include /I ../../../../lib/windows/memutil/include /I ../../../../lib/windows/container/include /D WIN32 /D NDEBUG /D _CONSOLE /D _MBCS /YX /FD /c -# ADD BASE RSC /l 0x413 /d NDEBUG -# ADD RSC /l 0x413 /d NDEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib /nologo /subsystem:console /machine:I386 /libpath:..\..\..\..\lib\windows\glut-3.7\lib\\ - -!ELSEIF $(CFG) == BSP_GhostTest - Win32 Debug - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Debug -# PROP BASE Intermediate_Dir Debug -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir Debug -# PROP Intermediate_Dir Debug -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _CONSOLE /D _MBCS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ../../extern/ /I ../../../../lib/windows/string/include /I ../../../../lib/windows/ghost/include /I ../../../../lib/windows/moto/include /I ../../../../lib/windows/memutil/include /I ../../../../lib/windows/container/include /D WIN32 /D _DEBUG /D _CONSOLE /D _MBCS /YX /FD /GZ /c -# ADD BASE RSC /l 0x413 /d _DEBUG -# ADD RSC /l 0x413 /d _DEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glu32.lib opengl32.lib user32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36579] trunk/blender/source/blender/ blenkernel/intern/displist.c: Fix #27346: When The FONT object is blank, the dimensions are calculated wong.
Revision: 36579
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36579
Author: nazgul
Date: 2011-05-09 20:14:34 + (Mon, 09 May 2011)
Log Message:
---
Fix #27346: When The FONT object is blank, the dimensions are calculated wong.
This commit fixes boundbox for empty curve-typed objects. Because of strange
reason (-1,-1,-1) and (1,1,1) was used as boundbox. Now it uses zero-sized
boundbox (as it's done for meshes).
This commit makes nothig with that single space character text from the report.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/displist.c
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2011-05-09
20:13:48 UTC (rev 36578)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2011-05-09
20:14:34 UTC (rev 36579)
@@ -1973,8 +1973,9 @@
}
if(!doit) {
- min[0] = min[1] = min[2] = -1.0f;
- max[0] = max[1] = max[2] = 1.0f;
+ /* there's no geometry in displist, use zero-sized
boundbox */
+ zero_v3(min);
+ zero_v3(max);
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36580] branches/bmesh/blender/source/ blender: =bmesh= undo loopcut commit, for some reason the recent merge didn 't catch it
Revision: 36580
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36580
Author: joeedh
Date: 2011-05-09 20:43:05 + (Mon, 09 May 2011)
Log Message:
---
=bmesh= undo loopcut commit, for some reason the recent merge didn't catch it
Modified Paths:
--
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
===
--- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-05-09 20:14:34 UTC (rev 36579)
+++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-05-09 20:43:05 UTC (rev 36580)
@@ -1707,6 +1707,8 @@
kcd-vthresh = KMAXDIST-1;
kcd-ethresh = KMAXDIST;
+ kcd-extend = 1;
+
knife_recalc_projmat(kcd);
ED_region_tag_redraw(kcd-ar);
@@ -1825,7 +1827,11 @@
return OPERATOR_RUNNING_MODAL;
case EKEY:
- kcd-extend = event-val!=KM_RELEASE;
+ kcd-extend = event-val==KM_RELEASE;
+ if (event-val == KM_RELEASE) {
+ knife_finish_cut(kcd);
+ kcd-mode = MODE_IDLE;
+ }
return OPERATOR_RUNNING_MODAL;
case LEFTCTRLKEY:
case RIGHTCTRLKEY:
Modified: branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
===
--- branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
2011-05-09 20:14:34 UTC (rev 36579)
+++ branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
2011-05-09 20:43:05 UTC (rev 36580)
@@ -104,9 +104,6 @@
int extend;
int do_cut;
-
- double leftmouse_time;
- wmTimer *timer;
} tringselOpData;
/* modal loop selection drawing callback */
@@ -346,9 +343,6 @@
{
tringselOpData *lcd= op-customdata;
- if (lcd-timer)
- WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C),
lcd-timer);
-
/* deactivate the extra drawing stuff in 3D-View */
ED_region_draw_cb_exit(lcd-ar-type, lcd-draw_handle);
@@ -431,10 +425,6 @@
BMEdge *edge;
int dist = 75;
- /*if we're in the cut-n-slide macro, set release_confirm based on user
pref*/
- if (op-opm)
- RNA_boolean_set(op-next-ptr, release_confirm,
U.loopcut_finish_on_release);
-
if(modifiers_isDeformedByLattice(obedit) ||
modifiers_isDeformedByArmature(obedit))
BKE_report(op-reports, RPT_WARNING, Loop cut doesn't work
well on deformed edit mesh display);
@@ -470,7 +460,7 @@
switch (event-type) {
case RETKEY:
case LEFTMOUSE: /* confirm */ // XXX hardcoded
- if (event-val == KM_RELEASE) {
+ if (event-val == KM_PRESS) {
/* finish */
ED_region_tag_redraw(lcd-ar);
@@ -479,24 +469,11 @@
ED_area_headerprint(CTX_wm_area(C), NULL);
- return OPERATOR_FINISHED|OPERATOR_ABORT_MACRO;
- } else {
- lcd-timer =
WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER2, 0.12);
+ return OPERATOR_FINISHED;
}
ED_region_tag_redraw(lcd-ar);
break;
- case TIMER2:
- /* finish */
- ED_region_tag_redraw(lcd-ar);
-
- ringsel_finish(C, op);
- ringsel_exit(C, op);
-
- ED_area_headerprint(CTX_wm_area(C), NULL);
-
- return OPERATOR_FINISHED;
-
case RIGHTMOUSE: /* abort */ // XXX hardcoded
ED_region_tag_redraw(lcd-ar);
ringsel_exit(C, op);
Modified: branches/bmesh/blender/source/blender/editors/transform/transform.c
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36581] trunk/blender/intern/smoke/intern: Revert rename of r36578, breaks scons compile.
Revision: 36581
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36581
Author: jesterking
Date: 2011-05-09 21:34:52 + (Mon, 09 May 2011)
Log Message:
---
Revert rename of r36578, breaks scons compile.
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36578
Added Paths:
---
trunk/blender/intern/smoke/intern/main.cpp.bak
Removed Paths:
-
trunk/blender/intern/smoke/intern/original-main.cpp
Copied: trunk/blender/intern/smoke/intern/main.cpp.bak (from rev 36580,
trunk/blender/intern/smoke/intern/original-main.cpp)
===
--- trunk/blender/intern/smoke/intern/main.cpp.bak
(rev 0)
+++ trunk/blender/intern/smoke/intern/main.cpp.bak 2011-05-09 21:34:52 UTC
(rev 36581)
@@ -0,0 +1,72 @@
+//
+// This file is part of Wavelet Turbulence.
+//
+// Wavelet Turbulence 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 3 of the License, or
+// (at your option) any later version.
+//
+// Wavelet Turbulence 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 Wavelet Turbulence. If not, see http://www.gnu.org/licenses/.
+//
+// Copyright 2008 Theodore Kim and Nils Thuerey
+//
+//
+
+#include iostream
+#include FLUID_3D.h
+
+using namespace std;
+
+//
+//
+int main(int argc, char *argv[])
+{
+ cout
=
endl;
+ cout Wavelet Turbulence simulator endl;
+ cout
=
endl;
+ cout This code is Copyright 2008 Theodore Kim and Nils Thuerey and
released endl;
+ cout under the GNU public license. For more information see: endl
endl;
+ cout http://www.cs.cornell.edu/~tedkim/WTURB; endl;
+ cout
=
endl;
+
+ int xRes = 48;
+ int yRes = 64;
+ int zRes = 48;
+ int amplify = 4;
+ int totalCells = xRes * yRes * zRes;
+ int amplifiedCells = totalCells * amplify * amplify * amplify;
+
+ // print out memory requirements
+ long long int coarseSize = sizeof(float) * totalCells * 22 +
+ sizeof(unsigned char) * totalCells;
+ long long int fineSize = sizeof(float) * amplifiedCells * 7 + // big grids
+ sizeof(float) * totalCells * 8 + // small grids
+ sizeof(float) * 128 * 128 * 128; // noise tile
+ long long int totalMB = (coarseSize + fineSize) / 1048576;
+ cout Current coarse resolution: xRes x yRes x
zRes endl;
+ cout Current amplified resolution: xRes * amplify x yRes
* amplify
+ x zRes * amplify endl;
+ cout At least totalMB MB of RAM needed endl;
+ cout
=
endl;
+ cout.flush();
+
+ // create output directories
+ system(mkdir original.preview);
+ system(mkdir amplified.preview);
+ system(mkdir pbrt);
+
+ FLUID_3D fluid(xRes, yRes, zRes, amplify);
+ for (int x = 0; x 300; x++)
+ {
+fluid.addSmokeColumn();
+fluid.step();
+ }
+
+ return EXIT_SUCCESS;
+}
Deleted: trunk/blender/intern/smoke/intern/original-main.cpp
===
--- trunk/blender/intern/smoke/intern/original-main.cpp 2011-05-09 20:43:05 UTC
(rev 36580)
+++ trunk/blender/intern/smoke/intern/original-main.cpp 2011-05-09 21:34:52 UTC
(rev 36581)
@@ -1,72 +0,0 @@
-//
-// This file is part of Wavelet Turbulence.
-//
-// Wavelet Turbulence 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 3 of the License, or
-// (at your option) any later version.
-//
-// Wavelet Turbulence 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
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36582] branches/bmesh/blender/source/ blender/editors: =bmesh=
Revision: 36582
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36582
Author: joeedh
Date: 2011-05-09 21:38:55 + (Mon, 09 May 2011)
Log Message:
---
=bmesh=
added modal keymap for knife tool.
I'm not sure how to handle the panning
pass-through, it's still hardcoded to
happen on MIDDLEMOUSE.
Modified Paths:
--
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
===
--- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-05-09 21:34:52 UTC (rev 36581)
+++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
2011-05-09 21:38:55 UTC (rev 36582)
@@ -1750,6 +1750,61 @@
return OPERATOR_RUNNING_MODAL;
}
+enum {
+ KNF_MODAL_CANCEL=1,
+ KNF_MODAL_CONFIRM,
+ KNF_MODAL_MIDPOINT_ON,
+ KNF_MODAL_MIDPOINT_OFF,
+ KNF_MODAL_NEW_CUT,
+ KNF_MODEL_IGNORE_SNAP_ON,
+ KNF_MODEL_IGNORE_SNAP_OFF,
+ KNF_MODAL_ADD_CUT,
+};
+
+wmKeyMap* knifetool_modal_keymap(wmKeyConfig *keyconf)
+{
+ static EnumPropertyItem modal_items[] = {
+ {KNF_MODAL_CANCEL, CANCEL, 0, Cancel, },
+ {KNF_MODAL_CONFIRM, CONFIRM, 0, Confirm, },
+ {KNF_MODAL_MIDPOINT_ON, SNAP_MIDPOINTS_ON, 0, Snap To Midpoints On,
},
+ {KNF_MODAL_MIDPOINT_OFF, SNAP_MIDPOINTS_OFF, 0, Snap To Midpoints
Off, },
+ {KNF_MODEL_IGNORE_SNAP_ON, IGNORE_SNAP_ON, 0, Ignore Snapping On,
},
+ {KNF_MODEL_IGNORE_SNAP_OFF, IGNORE_SNAP_OFF, 0, Ignore Snapping
Off, },
+ {KNF_MODAL_NEW_CUT, NEW_CUT, 0, End Current Cut, },
+ {KNF_MODAL_ADD_CUT, ADD_CUT, 0, Add Cut, },
+
+ {0, NULL, 0, NULL, NULL}};
+
+ wmKeyMap *keymap= WM_modalkeymap_get(keyconf, Knife Tool Modal Map);
+
+ /* this function is called for each spacetype, only needs to add map
once */
+ if(keymap) return NULL;
+
+ keymap= WM_modalkeymap_add(keyconf, Transform Modal Map, modal_items);
+
+ /* items for modal map */
+ WM_modalkeymap_add_item(keymap, ESCKEY,KM_PRESS, KM_ANY, 0,
KNF_MODAL_CONFIRM);
+ WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, KM_ANY, 0,
KNF_MODAL_ADD_CUT);
+ WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_PRESS, KM_ANY, 0,
KNF_MODAL_CONFIRM);
+ WM_modalkeymap_add_item(keymap, RETKEY, KM_PRESS, KM_ANY, 0,
KNF_MODAL_CONFIRM);
+ WM_modalkeymap_add_item(keymap, PADENTER, KM_PRESS, KM_ANY, 0,
KNF_MODAL_CONFIRM);
+ WM_modalkeymap_add_item(keymap, EKEY, KM_PRESS, 0, 0,
KNF_MODAL_NEW_CUT);
+
+ WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_PRESS, KM_ANY, 0,
KNF_MODAL_MIDPOINT_ON);
+ WM_modalkeymap_add_item(keymap, LEFTCTRLKEY, KM_RELEASE, KM_ANY, 0,
KNF_MODAL_MIDPOINT_OFF);
+ WM_modalkeymap_add_item(keymap, RIGHTCTRLKEY, KM_PRESS, KM_ANY, 0,
KNF_MODAL_MIDPOINT_ON);
+ WM_modalkeymap_add_item(keymap, RIGHTCTRLKEY, KM_RELEASE, KM_ANY, 0,
KNF_MODAL_MIDPOINT_OFF);
+
+ WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0,
KNF_MODEL_IGNORE_SNAP_ON);
+ WM_modalkeymap_add_item(keymap, LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0,
KNF_MODEL_IGNORE_SNAP_OFF);
+ WM_modalkeymap_add_item(keymap, RIGHTSHIFTKEY, KM_PRESS, KM_ANY, 0,
KNF_MODEL_IGNORE_SNAP_ON);
+ WM_modalkeymap_add_item(keymap, RIGHTSHIFTKEY, KM_RELEASE, KM_ANY, 0,
KNF_MODEL_IGNORE_SNAP_OFF);
+
+ WM_modalkeymap_assign(keymap, MESH_OT_knifetool);
+
+ return keymap;
+}
+
static int knifetool_modal (bContext *C, wmOperator *op, wmEvent *event)
{
Object *obedit;
@@ -1768,84 +1823,91 @@
if (kcd-mode == MODE_PANNING)
kcd-mode = kcd-prevmode;
- kcd-snap_midpoints = event-ctrl;
- kcd-ignore_vert_snapping = kcd-ignore_edge_snapping = event-shift;
-
- switch (event-type) {
- case ESCKEY:
- case RETKEY: /* confirm */ // XXX hardcoded
- if (event-val == KM_RELEASE) {
- if (kcd-mode == MODE_DRAGGING event-type
== ESCKEY) {
- kcd-mode = MODE_IDLE;
- ED_region_tag_redraw(kcd-ar);
- } else {
- /* finish */
- ED_region_tag_redraw(kcd-ar);
-
- knifetool_finish(C, op);
- knifetool_exit(C, op);
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36583] trunk/blender/intern/smoke/intern: Change name to one that should not collide with either SCons or auto cleanups .
Revision: 36583
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36583
Author: gsrb3d
Date: 2011-05-09 21:45:01 + (Mon, 09 May 2011)
Log Message:
---
Change name to one that should not collide with either SCons or auto cleanups.
Things like .back, .backup, .bak or ~ are easy preys.
Added Paths:
---
trunk/blender/intern/smoke/intern/main.cpp_disabled
Removed Paths:
-
trunk/blender/intern/smoke/intern/main.cpp.bak
Deleted: trunk/blender/intern/smoke/intern/main.cpp.bak
===
--- trunk/blender/intern/smoke/intern/main.cpp.bak 2011-05-09 21:38:55 UTC
(rev 36582)
+++ trunk/blender/intern/smoke/intern/main.cpp.bak 2011-05-09 21:45:01 UTC
(rev 36583)
@@ -1,72 +0,0 @@
-//
-// This file is part of Wavelet Turbulence.
-//
-// Wavelet Turbulence 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 3 of the License, or
-// (at your option) any later version.
-//
-// Wavelet Turbulence 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 Wavelet Turbulence. If not, see http://www.gnu.org/licenses/.
-//
-// Copyright 2008 Theodore Kim and Nils Thuerey
-//
-//
-
-#include iostream
-#include FLUID_3D.h
-
-using namespace std;
-
-//
-//
-int main(int argc, char *argv[])
-{
- cout
=
endl;
- cout Wavelet Turbulence simulator endl;
- cout
=
endl;
- cout This code is Copyright 2008 Theodore Kim and Nils Thuerey and
released endl;
- cout under the GNU public license. For more information see: endl
endl;
- cout http://www.cs.cornell.edu/~tedkim/WTURB; endl;
- cout
=
endl;
-
- int xRes = 48;
- int yRes = 64;
- int zRes = 48;
- int amplify = 4;
- int totalCells = xRes * yRes * zRes;
- int amplifiedCells = totalCells * amplify * amplify * amplify;
-
- // print out memory requirements
- long long int coarseSize = sizeof(float) * totalCells * 22 +
- sizeof(unsigned char) * totalCells;
- long long int fineSize = sizeof(float) * amplifiedCells * 7 + // big grids
- sizeof(float) * totalCells * 8 + // small grids
- sizeof(float) * 128 * 128 * 128; // noise tile
- long long int totalMB = (coarseSize + fineSize) / 1048576;
- cout Current coarse resolution: xRes x yRes x
zRes endl;
- cout Current amplified resolution: xRes * amplify x yRes
* amplify
- x zRes * amplify endl;
- cout At least totalMB MB of RAM needed endl;
- cout
=
endl;
- cout.flush();
-
- // create output directories
- system(mkdir original.preview);
- system(mkdir amplified.preview);
- system(mkdir pbrt);
-
- FLUID_3D fluid(xRes, yRes, zRes, amplify);
- for (int x = 0; x 300; x++)
- {
-fluid.addSmokeColumn();
-fluid.step();
- }
-
- return EXIT_SUCCESS;
-}
Copied: trunk/blender/intern/smoke/intern/main.cpp_disabled (from rev 36582,
trunk/blender/intern/smoke/intern/main.cpp.bak)
===
--- trunk/blender/intern/smoke/intern/main.cpp_disabled
(rev 0)
+++ trunk/blender/intern/smoke/intern/main.cpp_disabled 2011-05-09 21:45:01 UTC
(rev 36583)
@@ -0,0 +1,72 @@
+//
+// This file is part of Wavelet Turbulence.
+//
+// Wavelet Turbulence 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 3 of the License, or
+// (at your option) any later version.
+//
+// Wavelet Turbulence 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
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36584] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_newcore.c: =bmesh= fixed dissolve verts crash
Revision: 36584
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36584
Author: joeedh
Date: 2011-05-09 21:55:15 + (Mon, 09 May 2011)
Log Message:
---
=bmesh= fixed dissolve verts crash
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-05-09 21:45:01 UTC (rev 36583)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-05-09 21:55:15 UTC (rev 36584)
@@ -931,8 +931,9 @@
/*create region face*/
newf = BM_Make_Ngon(bm, v1, v2, edges, tote, 0);
- if (!newf) {
- err = Invalid boundary region to join faces;
+ if (!newf || BMO_HasError(bm)) {
+ if (!BMO_HasError(bm))
+ err = Invalid boundary region to join faces;
goto error;
}
@@ -965,7 +966,7 @@
l = l-next;
} while (l != bm_firstfaceloop(newf));
-
+
BM_Copy_Attributes(bm, bm, faces[0], newf);
/*add holes*/
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36585] branches/bmesh/blender/source/ blender/editors: =bmesh= fixed prop crasher and knifetool modal map typo
Revision: 36585 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36585 Author: joeedh Date: 2011-05-09 22:05:07 + (Mon, 09 May 2011) Log Message: --- =bmesh= fixed prop crasher and knifetool modal map typo Modified Paths: -- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c === --- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c 2011-05-09 21:55:15 UTC (rev 36584) +++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c 2011-05-09 22:05:07 UTC (rev 36585) @@ -1780,7 +1780,7 @@ /* this function is called for each spacetype, only needs to add map once */ if(keymap) return NULL; - keymap= WM_modalkeymap_add(keyconf, Transform Modal Map, modal_items); + keymap= WM_modalkeymap_add(keyconf, Knife Tool Modal Map, modal_items); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY,KM_PRESS, KM_ANY, 0, KNF_MODAL_CONFIRM); Modified: branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c === --- branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c 2011-05-09 21:55:15 UTC (rev 36584) +++ branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c 2011-05-09 22:05:07 UTC (rev 36585) @@ -2485,7 +2485,7 @@ countsel++; if(propmode) - count += efa-len; + count++; } } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36586] branches/bmesh/blender/source/ blender/editors/uvedit/uvedit_ops.c: =bmesh= fixed unlink uv selection bug
Revision: 36586
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36586
Author: joeedh
Date: 2011-05-09 22:07:31 + (Mon, 09 May 2011)
Log Message:
---
=bmesh= fixed unlink uv selection bug
Modified Paths:
--
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
2011-05-09 22:05:07 UTC (rev 36585)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
2011-05-09 22:07:31 UTC (rev 36586)
@@ -2157,7 +2157,7 @@
continue;
BM_ITER(l, liter, em-bm, BM_LOOPS_OF_FACE, efa) {
- luv = CustomData_bmesh_get(em-bm-pdata,
l-head.data, CD_MLOOPUV);
+ luv = CustomData_bmesh_get(em-bm-ldata,
l-head.data, CD_MLOOPUV);
if (!(luv-flag MLOOPUV_VERTSEL)) {
desel = 1;
@@ -2167,7 +2167,7 @@
if (desel) {
BM_ITER(l, liter, em-bm, BM_LOOPS_OF_FACE, efa) {
- luv = CustomData_bmesh_get(em-bm-pdata,
l-head.data, CD_MLOOPUV);
+ luv = CustomData_bmesh_get(em-bm-ldata,
l-head.data, CD_MLOOPUV);
luv-flag = ~MLOOPUV_VERTSEL;
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36587] branches/bmesh/blender/source/ blender/blenkernel/intern/editderivedbmesh.c: =bmesh= fixed mesh deform crasher
Revision: 36587
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36587
Author: joeedh
Date: 2011-05-09 22:16:31 + (Mon, 09 May 2011)
Log Message:
---
=bmesh= fixed mesh deform crasher
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-05-09 22:07:31 UTC (rev 36586)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-05-09 22:16:31 UTC (rev 36587)
@@ -1409,7 +1409,7 @@
bmDM_loopIter loopiter;
} bmDM_faceIter;
-void bmDM_faceIterStep(void *self)
+static void bmDM_faceIterStep(void *self)
{
bmDM_faceIter *iter = self;
@@ -1431,7 +1431,7 @@
if (!iter-nextf) iter-head.done = 1;
}
-void *bmDM_getFaceCDData(void *self, int type, int layer)
+static void *bmDM_getFaceCDData(void *self, int type, int layer)
{
bmDM_faceIter *iter = self;
@@ -1440,7 +1440,7 @@
else return CustomData_bmesh_get_n(iter-bm-pdata,
iter-f-head.data, type, layer);
}
-void bmDM_loopIterStep(void *self)
+static void bmDM_loopIterStep(void *self)
{
bmDM_loopIter *iter = self;
@@ -1456,7 +1456,7 @@
iter-head.eindex = BMINDEX_GET(iter-l-e);
}
-void *bmDM_getLoopCDData(void *self, int type, int layer)
+static void *bmDM_getLoopCDData(void *self, int type, int layer)
{
bmDM_loopIter *iter = self;
@@ -1465,7 +1465,7 @@
else return CustomData_bmesh_get_n(iter-bm-ldata,
iter-l-head.data, type, layer);
}
-void *bmDM_getVertCDData(void *self, int type, int layer)
+static void *bmDM_getVertCDData(void *self, int type, int layer)
{
bmDM_loopIter *iter = self;
@@ -1479,7 +1479,7 @@
MEM_freeN(self);
}
-void bmDM_nulliterFree(void *UNUSED(self))
+static void bmDM_nulliterFree(void *UNUSED(self))
{
}
@@ -1541,6 +1541,24 @@
return (DMFaceIter*) iter;
}
+static void bmDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
+{
+ EditDerivedBMesh *emdm= (EditDerivedBMesh*) dm;
+ BMVert *eve;
+ BMIter iter;
+ int i;
+
+ BM_ITER(eve, iter, emdm-tc-bm, BM_VERTS_OF_MESH, NULL) {
+ if (emdm-vertexCos) {
+ copy_v3_v3(cos_r[i], emdm-vertexCos[i]);
+ } else {
+ copy_v3_v3(cos_r[i], eve-co);
+ }
+
+ i++;
+ }
+}
+
static void bmDM_release(DerivedMesh *dm)
{
EditDerivedBMesh *bmdm= (EditDerivedBMesh *)dm;
@@ -1625,7 +1643,8 @@
bmdm-dm.numFaceData = em-tottri;
bmdm-dm.numLoopData = bm-totloop;
bmdm-dm.numPolyData = bm-totface;
-
+
+ bmdm-dm.getVertCos = bmDM_getVertCos;
bmdm-dm.getMinMax = bmDM_getMinMax;
bmdm-dm.getVertDataLayout = bmDm_getVertDataLayout;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36588] branches/blender2.4/release/ scripts/import_dxf.py: fixes for DXF-importer script:
Revision: 36588
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36588
Author: migius
Date: 2011-05-10 00:18:36 + (Tue, 10 May 2011)
Log Message:
---
fixes for DXF-importer script:
v1.12 - 2011.05.07 by migius
h1 fixed for SPLINE: points coordinates are always in WCS
h1 code beautifying
v1.12 - 2010.04.29 by migius
g1 preparation for non-UI-mode: import_dxf.main('dxf_file_name.dxf')
Modified Paths:
--
branches/blender2.4/release/scripts/import_dxf.py
Modified: branches/blender2.4/release/scripts/import_dxf.py
===
--- branches/blender2.4/release/scripts/import_dxf.py 2011-05-09 22:16:31 UTC
(rev 36587)
+++ branches/blender2.4/release/scripts/import_dxf.py 2011-05-10 00:18:36 UTC
(rev 36588)
@@ -7,7 +7,7 @@
Tooltip: 'Import for DWG/DXF geometry data.'
__author__ = 'Kitsu(Ed Blake) migius(Remigiusz Fiedler)'
-__version__ = '1.12 - 2010.03.04 by migius'
+__version__ = '1.12 - 2011.05.07 by migius'
__url__ = [http://blenderartists.org/forum/showthread.php?t=84319;,
http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D;]
__email__ = [migius(at)gmx.net,Kitsune_e(at)yahoo.com]
@@ -111,6 +111,11 @@
-- support DXF-definitions of autoshade: scene, lights and cameras
-- support ortho mode for VIEWs and VPORTs as cameras
+ v1.12 - 2011.05.07 by migius
+ h1 fixed for SPLINE: points coordinates are always in WCS
+ h1 code beautifying
+ v1.12 - 2010.04.29 by migius
+ g1 preparation for non-UI-mode: import_dxf.main('dxf_file_name.dxf')
v1.12 - 2010.03.04 by migius
f1 fix POLYFACE non-standard ordered double-vertices
v1.12 - 2009.11.28 by migius
@@ -685,8 +690,8 @@
return vec
-#--
-def getSceneChild(name):
+
+def getSceneChild(name): #--
dudu = [i for i in SCENE.objects if i.name==name]
# dudu = [i for i in SCENE.getChildren() if i.name==name]
#print 'deb:getSceneChild %s -result: %s:' %(name,dudu)
#-
@@ -1230,8 +1235,8 @@
#print 'deb:drawPlFace: len of points_list:\n', len(points)
#---
#print 'deb:drawPlFace: len of faces_list:\n', len(faces)
#---
- print 'deb:drawPlFace: points_list:\n', points
#---
- print 'deb:drawPlFace: faces_list:\n', faces
#---
+ #print 'deb:drawPlFace: points_list:\n', points
#---
+ #print 'deb:drawPlFace: faces_list:\n', faces
#---
obname = 'pf_%s' %self.layer # create object name from layer
name
obname = obname[:MAX_NAMELENGTH]
me = Mesh.New(obname) # create a new mesh
@@ -1356,7 +1361,7 @@
firstpoint = nurbs_points[0]
curve = pline.appendNurb(firstpoint)
curve.setType(4) # set curve_type NURBS
- print 'deb: dir(curve):', dir(curve[-1])
#
+ #print 'deb: dir(curve):', dir(curve[-1])
#
for point in nurbs_points[1:]:
curve.append(point)
#TODO: what is the trick for bevel radius?
curve[-1].radius = 1.0
@@ -1501,7 +1506,8 @@
pline.setExt1(1.0) # curve-extrusion accepts only (0.0
- 2.0)
ob.LocZ = thic + LocZ
- transform(self.extrusion, 0, ob)
+ if self.pltype!='spline':
+ transform(self.extrusion, 0, ob)
if thic != 0.0:
ob.SizeZ *= abs(thic)
@@ -2057,29 +2063,29 @@
Class for objects representing dxf SPLINEs.
Expects an entity object of type spline as input.
-100 - Subclass marker (AcDbSpline)
-210,220, 230 - Normal vector (omitted if the spline is nonplanar) X,Y,Z
values of normal vector
-70 - Spline flag (bit coded):
- 1 = Closed spline
- 2 = Periodic spline
- 4 = Rational spline
- 8 = Planar
- 16 = Linear (planar bit is also set)
-71 - Degree of the spline curve
-72 - Number of knots
-73 - Number of control points
-74 - Number of fit points (if any)
-42 - Knot tolerance (default = 0.001)
-43 - Control-point tolerance (default = 0.001)
-44 - Fit tolerance (default = 0.01)
-12,22,32 - Start tangent--may be omitted (in WCS). X,Y,Z values of start
tangent--may be omitted (in WCS).
-13,23, 33 - End tangent--may be omitted (in WCS). X,Y,Z values of end
tangent--may be omitted (in WCS)
-40 - Knot value (one entry per knot)
-41 - Weight (if not 1); with multiple group pairs, are present if all are not 1
-10,20, 30 - Control points (in WCS) one entry per control point.
-DXF: X value; APP: 3D
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36589] branches/bmesh/blender: svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36589
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36589
Author: campbellbarton
Date: 2011-05-10 00:45:06 + (Tue, 10 May 2011)
Log Message:
---
svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36564
Modified Paths:
--
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
branches/bmesh/blender/intern/ghost/CMakeLists.txt
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/source/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/blenfont/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/editors/include/ED_image.h
branches/bmesh/blender/source/blender/editors/render/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/gpu/CMakeLists.txt
branches/bmesh/blender/source/blender/imbuf/intern/filter.c
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/creator/CMakeLists.txt
Added Paths:
---
branches/bmesh/blender/intern/smoke/intern/main.cpp_disabled
Removed Paths:
-
branches/bmesh/blender/intern/smoke/intern/main.cpp.back
Property Changed:
branches/bmesh/blender/
branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsw
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___
Modified: svn:mergeinfo
- /trunk/blender:31524-36564
+ /trunk/blender:31524-36583
Modified: branches/bmesh/blender/CMakeLists.txt
===
--- branches/bmesh/blender/CMakeLists.txt 2011-05-10 00:18:36 UTC (rev
36588)
+++ branches/bmesh/blender/CMakeLists.txt 2011-05-10 00:45:06 UTC (rev
36589)
@@ -870,7 +870,7 @@
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
-
+
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
Modified: branches/bmesh/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest.dsp
===
---
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36590] trunk/blender: camera composition guides: center, thirds, golden rule
Revision: 36590
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36590
Author: campbellbarton
Date: 2011-05-10 03:03:53 + (Tue, 10 May 2011)
Log Message:
---
camera composition guides: center, thirds, golden rule
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/makesdna/DNA_camera_types.h
trunk/blender/source/blender/makesrna/intern/rna_camera.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
2011-05-10 00:45:06 UTC (rev 36589)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py
2011-05-10 03:03:53 UTC (rev 36590)
@@ -127,6 +127,7 @@
col.prop(cam, show_mist, text=Mist)
col.prop(cam, show_title_safe, text=Title Safe)
col.prop(cam, show_name, text=Name)
+col.prop_menu_enum(cam, show_guide)
col = split.column()
col.prop(cam, draw_size, text=Size)
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2011-05-10 00:45:06 UTC (rev 36589)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2011-05-10 03:03:53 UTC (rev 36590)
@@ -921,6 +921,60 @@
}
}
+static void drawviewborder_grid3(float x1, float x2, float y1, float y2, float
fac, char diagonal)
+{
+ float x3, y3, x4, y4;
+
+ x3= x1 + fac * (x2-x1);
+ y3= y1 + fac * (y2-y1);
+ x4= x1 + (1.0f - fac) * (x2-x1);
+ y4= y1 + (1.0f - fac) * (y2-y1);
+
+ glBegin(GL_LINES);
+ switch(diagonal) {
+ case '\0':
+ glVertex2f(x1, y3);
+ glVertex2f(x2, y3);
+
+ glVertex2f(x1, y4);
+ glVertex2f(x2, y4);
+
+ glVertex2f(x3, y1);
+ glVertex2f(x3, y2);
+
+ glVertex2f(x4, y1);
+ glVertex2f(x4, y2);
+ break;
+ case 'H': /* hoz */
+ glVertex2f(x1, y1);
+ glVertex2f(x2, y4);
+
+ glVertex2f(x1, y3);
+ glVertex2f(x2, y2);
+
+ glVertex2f(x2, y1);
+ glVertex2f(x1, y4);
+
+ glVertex2f(x2, y3);
+ glVertex2f(x1, y2);
+ break;
+ case 'V': /* vert */
+ glVertex2f(x1, y1);
+ glVertex2f(x4, y2);
+
+ glVertex2f(x3, y1);
+ glVertex2f(x2, y2);
+
+ glVertex2f(x1, y2);
+ glVertex2f(x4, y1);
+
+ glVertex2f(x3, y2);
+ glVertex2f(x2, y1);
+ break;
+ }
+ glEnd();
+}
+
static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
{
float fac, a;
@@ -995,21 +1049,70 @@
}
/* safety border */
- if (ca (ca-flag CAM_SHOWTITLESAFE)) {
- fac= 0.1;
-
- a= fac*(x2-x1);
- x1+= a;
- x2-= a;
-
- a= fac*(y2-y1);
- y1+= a;
- y2-= a;
-
- UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
-
- uiSetRoundBox(15);
- uiDrawBox(GL_LINE_LOOP, x1, y1, x2, y2, 12.0);
+ if(ca) {
+ if (ca-dtx CAM_DTX_CENTER) {
+ UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
+
+ x3= x1+ 0.5f*(x2-x1);
+ y3= y1+ 0.5f*(y2-y1);
+
+ glBegin(GL_LINES);
+ glVertex2f(x1, y3);
+ glVertex2f(x2, y3);
+
+ glVertex2f(x3, y1);
+ glVertex2f(x3, y2);
+ glEnd();
+ }
+
+ if (ca-dtx CAM_DTX_CENTER_DIAG) {
+ UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
+
+ glBegin(GL_LINES);
+ glVertex2f(x1, y1);
+ glVertex2f(x2, y2);
+
+ glVertex2f(x1, y2);
+ glVertex2f(x2, y1);
+ glEnd();
+ }
+
+ if (ca-dtx CAM_DTX_THIRDS) {
+ UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
+ drawviewborder_grid3(x1, x2, y1, y2, 1.0f/3.0f, '\0');
+ }
+
+ if (ca-dtx CAM_DTX_GOLDEN) {
+ UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 0.25, 0);
+ drawviewborder_grid3(x1, x2, y1, y2,
1.0f-(1.0f/1.61803399),
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36591] trunk/blender/source/blender/ editors/interface/interface_handlers.c: entering non utf8 text in filepaths in the file selector would get incor
Revision: 36591
http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36591
Author: campbellbarton
Date: 2011-05-10 05:07:24 + (Tue, 10 May 2011)
Log Message:
---
entering non utf8 text in filepaths in the file selector would get incorrectly
stripped.
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2011-05-10 03:03:53 UTC (rev 36590)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2011-05-10 05:07:24 UTC (rev 36591)
@@ -262,14 +262,12 @@
static int ui_is_utf8_but(uiBut *but)
{
if (but-rnaprop) {
- int subtype= RNA_property_subtype(but-rnaprop);
-
- if(ELEM3(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME)) {
- return TRUE;
- }
+ const int subtype= RNA_property_subtype(but-rnaprop);
+ return !(ELEM3(subtype, PROP_FILEPATH, PROP_DIRPATH,
PROP_FILENAME));
}
-
- return !(but-flag UI_BUT_NO_UTF8);
+ else {
+ return !(but-flag UI_BUT_NO_UTF8);
+ }
}
/* ** button apply/revert /
@@ -1679,7 +1677,7 @@
static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
{
if(but) {
- if(!ui_is_utf8_but(but)) {
+ if(ui_is_utf8_but(but)) {
int strip= BLI_utf8_invalid_strip(but-editstr,
strlen(but-editstr));
/* not a file?, strip non utf-8 chars */
if(strip) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36592] trunk/blender/source/blender/ makesrna/intern/rna_camera.c: Typo in composition guides
Revision: 36592 http://projects.blender.org/scm/viewvc.php?view=revroot=bf-blenderrevision=36592 Author: zanqdo Date: 2011-05-10 05:20:18 + (Tue, 10 May 2011) Log Message: --- Typo in composition guides Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_camera.c Modified: trunk/blender/source/blender/makesrna/intern/rna_camera.c === --- trunk/blender/source/blender/makesrna/intern/rna_camera.c 2011-05-10 05:07:24 UTC (rev 36591) +++ trunk/blender/source/blender/makesrna/intern/rna_camera.c 2011-05-10 05:20:18 UTC (rev 36592) @@ -94,7 +94,7 @@ RNA_def_property_enum_sdna(prop, NULL, dtx); RNA_def_property_enum_items(prop, prop_draw_type_extra_items); RNA_def_property_flag(prop, PROP_ENUM_FLAG); - RNA_def_property_ui_text(prop, Comosition Guide, Draw overlay); + RNA_def_property_ui_text(prop, Composition Guides, Draw overlay); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); /* Number values */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
