Commit Graph

66005 Commits

Author SHA1 Message Date
Campbell Barton
1e0c3d315b minor cleanup, no functional changes. 2011-05-09 14:41:44 +00:00
Campbell Barton
5ba0c2c049 tag unused arguments, quiet some warnings 2011-05-09 14:32:55 +00:00
Sergey Sharybin
18e9d9c3e2 Recreate mipmaps after undo in image editor 2011-05-09 13:13:16 +00:00
M.G. Kishalmi
88a13d7395 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.
2011-05-09 12:46:59 +00:00
Brecht Van Lommel
42e2c47b3d Cycles: fix node outputs not connect to more than one input. 2011-05-09 11:02:04 +00:00
Brecht Van Lommel
442baef055 Cycles: different fix for animation render, in render API instead of python script. 2011-05-09 10:43:09 +00:00
Brecht Van Lommel
f0d91fec1b Cycles: fix crash when drawing properties UI while editing node links. 2011-05-09 10:40:53 +00:00
Sergey Sharybin
99ee18c684 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.
2011-05-09 10:03:06 +00:00
Campbell Barton
5776d7ff9c svn merge -r36529:36564 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-09 09:38:48 +00:00
Brecht Van Lommel
31f44d8142 Cycles: fix color difference between render / 3d view with color management disabled. 2011-05-09 09:03:08 +00:00
Campbell Barton
9d8a08de55 warning fixes 2011-05-09 08:20:39 +00:00
Campbell Barton
4c71d9efb5 set svn end of lines to native 2011-05-09 08:15:38 +00:00
Brecht Van Lommel
763adbc7b9 Code cleanup: warning fixes. 2011-05-09 08:01:48 +00:00
Brecht Van Lommel
30155e958b Code cleanup: remove unused image window code, already implemented elsewhere. 2011-05-09 07:54:21 +00:00
Campbell Barton
1f90b86ae1 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
2011-05-09 07:48:16 +00:00
Campbell Barton
f5bcf9211d moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes. 2011-05-09 06:53:39 +00:00
Campbell Barton
c8e2df0128 writing normal customdata was failing because vec3f type wasn't stored in SDNA. 2011-05-09 05:55:41 +00:00
Campbell Barton
a70e49163a removed the OBJ export recent commit, didnt realize BMesh had its own OBJ exporter. 2011-05-09 05:18:38 +00:00
Campbell Barton
b93594bf30 quiet more compiler warnings, also found a bug using printf rather then fprintf. 2011-05-09 05:09:07 +00:00
Campbell Barton
5a2a3d7d82 more syncing with trunk, also cleared many warnings with gcc4.6 2011-05-09 04:06:48 +00:00
Campbell Barton
14a2330d7b copied across changes which were missed by merging. 2011-05-09 02:45:52 +00:00
Tamito Kajiyama
31471f644c Merged changes in the trunk up to revision 36551.
Conflicts resolved:
source/creator/SConscript
2011-05-09 01:38:29 +00:00
Joseph Eagar
6ef77cf95a =bmesh= merge from trunk at r36529 2011-05-08 23:43:18 +00:00
Sergey Sharybin
f8f4f73cc5 Bug fix own collection:
- Recreate mipmaps if they're dirty when drawing background image
   (this prevents "delayed" update of background image when you're paiting on it
    in image editor).
 - Mark mipmaps as dirty when inverting image channels.

TODO: there's memory leak caused by IMB_remakemipmap, but it'll be
      anuther bugfix commit after discussion with other devs.
2011-05-08 20:21:31 +00:00
Campbell Barton
b432520799 fix [#27324] WindowManager.invoke_search_popup() crashes blender and does not work
also minor formatting fixes.
2011-05-08 12:51:05 +00:00
Campbell Barton
d4e540dff3 comment some unused code. 2011-05-08 10:29:40 +00:00
Nathan Letwory
ed3fd72210 Apply second half of [#21590] .dds textures: fix for DXT1n format + sync with upstream nvtt
submitted by Amorilia

This updates the DDS module with upstearm nvtt (r1042).
2011-05-08 09:05:52 +00:00
Joshua Leung
aaa93c58b3 Fixes for bugs noticed during previous fix:
- In Drivers mode of Graph Editor, expanders for sub-object data were
not working at all. This was because they were getting overriden by an
errant ob-level drivers check
- Adding drivers from py-api didn't update Graph Editor
2011-05-08 05:41:57 +00:00
Joshua Leung
85b1b459ed RNA Bugfix:
The following script would fail:
#ob = bpy.context.active_object
pb = bpy.context.active_pose_bone
pb.bone.driver_add("hide")  # <--- exception here

The RNA-path function for Bone assumed that when it got called, it's
"id_data" (or owner-idblock-pointer) would only be ID_AR (i.e. an
armature). However, in the above example, pb.bone has ob as its
id_data, resulting in an invalid RNA path getting created. Added check
for this case, since it's likely to be common
2011-05-08 05:18:40 +00:00
Mitchell Stokes
2aea765d6e Committing patch [#27133] "Fix for for Object Color in BGE" by Kupoman
The tracker description:
"This patch fixes this bug:
http://projects.blender.org/tracker/index.php?func=detail&aid=25487&group_id=9&atid=306

This was accomplished by making sure the KX_GameObject's object color gets set during the conversion process in the method gameobject_from_blenderobject. Otherwise all the values for object color default to 0. The reason adding an IPO worked as a work around is because it set the object color."

The bug report mentioned is bug [#25487] "BGE: Object Color only works when it has a keyed frame"
2011-05-08 03:42:24 +00:00
Dalai Felinto
0b03268c17 Patch [#26799] embedded blenderplayer not receiving keyboard input by Sebastian Korczak
(patch co-reviewed by Nathan Letwory)

Overview: GHOST using rawinput for keyboard input. GHOST window receives WM_INPUT only when it is the active window. Child window cannot be active, so when embedding blenderplayer, WM_INPUT is consumed by top level parent window (for Burster it is the web browser window). Patch register raw input device as 'inputsink' - it makes GHOST window receives all keyboard messages. Window procedure check if GHOST window is active or focused.

::TranslateMessage(&msg) generates WM_CHAR etc. messages from WM_KEYDOWN, WM_KEYUP etc. Because of using RawInput only WM_INPUT messages are processed, so we doesn't need WM_CHAR, WM_KEYDOWN etc. [this is why ::TranslateMessage is no longer getting called].

Note: It's responsibility of the parent window (aka the wrapper) to send WM_SETFOCUS to child window (embedded blenderplayer).
However some parent windows (e.g. webbrowsers) will not send WM_SETFOCUS to the child window when someone clicks on it.
In those cases the blenderplayer needs to be patched to call setFocus(&msg); in the event of WM_LBUTTONDOWN (see GHOST_SystemWin32.cpp)
2011-05-07 22:28:56 +00:00
Nathan Letwory
3fe841597b Apply part of [#21590] .dds textures: fix for DXT1n format
Submitted by Amorilia.

DXT1 .dds textures with 1-bit alpha channel have their alpha channel imported in Blender.

The patch also makes change to contact info for the patch submitter.

I left the sync with upstream nvtt for another commit.
2011-05-07 20:53:49 +00:00
Sergey Sharybin
471c28f91c Fix #27319: Text editor "Find" does not locate words.
Added new option to find panel of space text which toggles
case-esensitive search.

Additional changes:
- Send NC_TEXT|NA_EDITED when removing markers in find_and_replace modifier
  this prevents "sticked" markers which disappears on first redraw when
  search text wasn't found
- Do not show "Text wasn't found" error when text to be searched is contained
  in the end of buffer and it's selected. Replacing/marking used to happen, but
  this popup message was really annoying for this case.

TODO: It's incorrect to use UI_GetThemeColor4ubv from this operator
2011-05-07 17:52:44 +00:00
Campbell Barton
e239085f70 io_utils.axis_conversion(...) utility function to easily convert the forward & up axis between different apps on import/export. 2011-05-07 11:25:59 +00:00
Joseph Eagar
3462ddf17f =bmesh=
Cut out some unwanted differences with trunk
in preparation for merge.  Also fixed some
warnings, though many remain.
2011-05-07 02:48:14 +00:00
Campbell Barton
770119d16f patch from Dan Eicher, CPack/RPM working again 2011-05-06 23:59:15 +00:00
Campbell Barton
7a5b16d175 missed updating warp modifier UI, gave a py error when selecting texture UI layer. 2011-05-06 23:54:40 +00:00
Campbell Barton
ca419b47a4 fix [#27298] Alt + RMB always extends selection 2011-05-06 23:46:24 +00:00
Brecht Van Lommel
309bb2937d Forgot to mention that for scons, I've disabled install of the texture and
sequence plugins, as was already done for cmake, they don't work in 2.5.

This is a fix for last commit, this file shouldn't have been included.
2011-05-06 20:21:20 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +00:00
Brecht Van Lommel
4eb1b5256e Code cleanup: PIL_dynlib, renamed to BLI_dynlib, and other tweaks. 2011-05-06 15:17:42 +00:00
Campbell Barton
e26b0c68a4 patch [#27205] Infinite recursion inside resolve_ncase() when passed a driver letter on Windows that does not exist
by Brandon Ehle (azverkan)
2011-05-06 11:27:04 +00:00
Brecht Van Lommel
d5929b452e Cycles: fix missing #include. 2011-05-06 09:19:29 +00:00
Brecht Van Lommel
576035f9e1 Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
patch by Ryakiotakis Antonis.
2011-05-06 08:16:44 +00:00
Campbell Barton
ba5d18b41f py/rna debugging option (defaults to off), which quickly exposes errors with RNA functions holding string pointers by making a temp copy of the string and freeing after the function is called. 2011-05-06 03:29:55 +00:00
Campbell Barton
22c22d4961 fix [#27304] uiItemsFullEnumO: operator missing srna ''
python strings are not static so dont hold pointers to them within blenders UI.
2011-05-06 02:55:09 +00:00
Campbell Barton
8751d1d927 [#26715] Blender2.57 crash when opening in Windows, non-latin char in path
this isn't a fix but GetModuleFileName is returning a name that doesn't exist, so finding python after this isn't working.

Show a popup that the path has an invalid name so at least the user can move it.
2011-05-06 01:03:36 +00:00
Campbell Barton
53096ebad5 add zlib include dir for cmake too. 2011-05-05 22:41:49 +00:00
Dalai Felinto
dfedec8a2c fix to scons after exotic was removed (patch from jms) 2011-05-05 18:50:17 +00:00
Janne Karhu
2137e2ecec Fix for [#27294] Subframes cause dampened particles to behave differently
* The unphysical particle damping wasn't scaled according to the timestep.
2011-05-05 17:07:20 +00:00