Commit Graph

30028 Commits

Author SHA1 Message Date
Brecht Van Lommel
d404c31e8d Cycles: fix sync issue with group instances. 2011-05-31 10:41:01 +00:00
Brecht Van Lommel
6a128eee7b Cycles: svn merge -r36777:37040 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ 2011-05-31 09:51:46 +00:00
Brecht Van Lommel
89983a2187 Cycles: fix compile error for cycles_test. 2011-05-31 09:47:19 +00:00
Campbell Barton
b434550edc fix for recent cmake changes 2011-05-31 09:27:33 +00:00
Nathan Letwory
90d3a3eac8 Make sure correct path separator is used. 2011-05-31 08:50:20 +00:00
Campbell Barton
348f947d80 tag unused rna args. 2011-05-31 02:14:25 +00:00
Campbell Barton
09da9d4393 cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Brecht Van Lommel
dcd55cef86 startup.blend: default ffmpeg output audio bitrate changed to 192. 2011-05-30 18:57:28 +00:00
Benoit Bolsee
884b9d1557 BGE: fix bug #26775, crash when physics constraint is defined on non-active objects. Patch provided by Sergey Sharybin, verified and applied. 2011-05-30 15:40:01 +00:00
Campbell Barton
c141ed0aa9 missed this import when moving load image function. 2011-05-30 12:19:30 +00:00
Brecht Van Lommel
337e74963b Fix #27522: crash when closing new render window with render error message
showing in the main window.
2011-05-30 11:44:28 +00:00
Campbell Barton
5a3aaf1fd1 cmake formatting adjustment, no functional change. 2011-05-30 10:51:37 +00:00
Campbell Barton
b92e6985cf fix for cmakes windows install target, was extracting python 4 times, note install(CODE... doesnt support CONFIGURATIONS setting. 2011-05-30 10:39:18 +00:00
Mitchell Stokes
221472f7b5 Moving the letterbox clear for the embedded player so it only clears when it needs to. Thanks to Juha Mäki-Kanto for the tip. 2011-05-29 18:09:38 +00:00
Martin Poirier
a72f101ac8 [#25886] Skeleton Sketching - Unclear UI for converting sketches into bones
Thanks Ronan Ducluzeau for the fix and Jason van Gumster for the report.
2011-05-29 16:04:09 +00:00
Sergey Sharybin
e1466b8ca2 Fix #27392: boolean intersect's
It was lag of optimization logic, which always retuns object's derivedMesh
if one of of boolean operation's meshes has got no faces.

Actually, result depends on operation and which mesh has got no faces.

Added small utility function to handle this.
2011-05-29 15:53:38 +00:00
Campbell Barton
11014aa34b access pythons code object directly rather than attribute access. 2011-05-29 11:05:52 +00:00
Mitchell Stokes
ebdca474b5 Fixing the initglobals leak in the Blenderplayer (G.main reference was being reassigned before it was freed). 2011-05-29 04:15:35 +00:00
Daniel Salazar
fc3904d7b3 General error in coderivative for orthogonal camera. Culprit of new bump failing on orthogonal cameras; bug #27492
Commiting bug kill by Sparky
2011-05-28 21:53:07 +00:00
Campbell Barton
d635a2b143 Disabling xinput wasn't done completely. 2011-05-28 15:34:02 +00:00
Sergey Sharybin
5ca36915a6 Silence some unused-but-set-variable warnings.
And small optimization for text search function :)
2011-05-28 14:52:28 +00:00
Sergey Sharybin
628a8151da Fix #27505: Text Editor always indent next line when a " is found (which is not always correct)
Do not indent if there's any non-space character after colon.

This only makes life a bit easier, but it's still not 100% correct indentation
strategy. For example when colon is inside non-closed string or so.
Also there's not indentation for { and un-indentation for }.

Handling such cases would require much smarter strategy..
2011-05-28 14:40:42 +00:00
Peter Schlaile
ce8467ffd3 == FFMPEG ==
Did some fine-tuning for AVOption -> AVOption2 crazyness
2011-05-28 14:16:56 +00:00
M.G. Kishalmi
9b5800bcd7 fixed "rather then" -> "rather than" typos all over the place 2011-05-28 13:11:24 +00:00
Jason Wilkins
844d6f0ac0 rearranged previous patch to compile with C89
conversion to double probably not needed
better comments
2011-05-28 12:33:53 +00:00
Nathan Letwory
43385394ed Introduce vars before using them, otherwise compile fails (reminder: with C, present all
your vars at the begin of the scope _before any other statement_).
2011-05-28 12:11:39 +00:00
Campbell Barton
97d553c471 wrong rna access function used in node UI 2011-05-28 12:04:56 +00:00
Jason Wilkins
7154b424e9 Fix: The radial control would fail, in sculpt mode, to set size if object-space sizing was enabled.
This was caused because a small part of sculpt's radial control code did not make it into the new version.  The old code would set a new object-space size by scaling it proportional to how much the new screen-space size was changed.  

The solution I implement here is to do the same scaling inside the RNA callbacks.  This way, users of those properties do not have to worry about inconsistency.

I added a comment warning that brush_set_size, brush_set_unified_size, brush_unprojected_radius, and brush_set_unprojected_radius do not guarantee consistency because it is not always possible to precisely know what the new unprojected radius is in all contexts where you might set the size.  

I would implement the consistency check at the lower level (in those listed functions) but at this time I think it needs to be looked at to make sure that won't cause problems.  In addition, I am not sure that scaling by the ratio of change is strictly correct in all cases.

In any case, this at least fixes the immediate problem.
2011-05-28 11:30:21 +00:00
M.G. Kishalmi
8246f94317 better error reporting for seq_swap() 2011-05-28 09:59:34 +00:00
Campbell Barton
a9dd90be78 move load_image into image_utils and add some docstrings to bpy_extras module. 2011-05-28 09:34:45 +00:00
Dalai Felinto
245d36b706 bugfix for: [#26753] PhysicsConstraints ID trouble on 64bit (linux at least).
[the problem also affected OSX]

PhysicsId are Long, not ints (see PyObject* KX_GameObject::PyGetPhysicsId() )

There is a reference in the code to use PyCapsule instead of int. I'm not sure
about that. This patch at least stops the crashes
(update: I talked with Campbell and he repeated that PyCapsule are better, but if long is working it's fine for now).
2011-05-28 08:16:34 +00:00
Campbell Barton
ecf2d1ff4e - generate sphinx docs for bpy_extras module
- add in support to doc generator for automatically generating docs for submodules.
2011-05-28 07:47:58 +00:00
Campbell Barton
20ae95422e include ffmpeg_compat header in cmake source list. 2011-05-28 04:53:17 +00:00
Dalai Felinto
d580ae1087 fix for embeded BGE viewport broken when not using letterboxing
this was broken after rev.36787 (api rewritten)
own reported bug, nowhere in the track (just to mess up with the bug fixing statistics)
2011-05-28 01:29:56 +00:00
Peter Schlaile
3ca0bfdd66 == FFMPEG ==
Small fix for a very old bug in swscaler color space support detection.
2011-05-28 00:07:33 +00:00
Peter Schlaile
ac034e1732 == FFMPEG ==
Revert of "SVN commit: /data/svn/bf-blender [36957]
trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.cpp: fix for
ffmpeg linking in BGE ( patch by Jens Verwiebe (jensverwiebe) over IRC)"

Sorry folks, that patch breaks current ffmpeg GIT version.

Good news: it's all handled now automagically by ffmpeg_compat.h in 
intern/ffmpeg

so: everything should be fine and dandy for very old and very new versions.
2011-05-27 23:46:47 +00:00
Peter Schlaile
42121590f4 == FFMPEG ==
Added central compatibility header file, which enables blender to compile
against very old ffmpeg versions as well as very new versions using the
*NEW* API. (Old API functions are simulated using macros and inline functions)

Added a whole lot of additional checks, tested against 6 different versions
down the timeline, hopefully, now finally all is well.
2011-05-27 23:33:40 +00:00
Dalai Felinto
a9467182fb fix for ffmpeg linking in BGE (patch by Jens Verwiebe (jensverwiebe) over IRC)
-	av_parse_video_rate(&frameRate, rateStr);
+	av_parse_video_frame_rate(&frameRate, rateStr);
2011-05-27 21:13:44 +00:00
Brecht Van Lommel
18ff3d5200 Attempted fix for #27482: game engine running slow due to revision 36698 which
fixed frame colors for letterbox drawing (happens when in camera view).

Cause is unclear, seems some sort of strange graphics driver thing on 32 bit.
Changes are a fix for the incorrect usage of glViewport, and avoiding the extra
clear if it's not needed.
2011-05-27 16:20:49 +00:00
Brecht Van Lommel
7e4ba190cb Cycles: fix GLEW library build issue. 2011-05-27 12:13:10 +00:00
Brecht Van Lommel
d369a6aaaf Windows installer and Path changes, fixing various issues:
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places

The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.

On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.

If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.

The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
2011-05-27 09:57:53 +00:00
Brecht Van Lommel
4bb582effb Cycles: some mix node blend modes not working correct:
subtract, screen, divide, difference, darken, lighten, overlay

patch by Sanne, thanks!
2011-05-27 09:38:49 +00:00
Peter Schlaile
0381c444fd == FFMPEG ==
Fixed and added additional ffmpeg cruft checking. Oh dear.
2011-05-27 07:47:42 +00:00
Peter Schlaile
50289e62cb == FFMPEG ==
... and another funny version patch, since OpenSuse obviously used some version "in-between"
2011-05-26 23:51:02 +00:00
Campbell Barton
72499b070a own recent commits caused crash with the grease pencil in camera view, always pass rv3d argument now.
also found a bug where hex_to_rgb could use un-initialized memory.
2011-05-26 23:29:40 +00:00
Peter Schlaile
f1d3982bf6 == FFMPEG ==
Added some API compatibility code again, since some API-changes weren't even documented 
(they even didn't do a proper version-bump, arghh!)

If it breaks again, please tell!
2011-05-26 23:19:15 +00:00
Campbell Barton
e070975ae4 missed this in recent commit. 2011-05-26 22:48:06 +00:00
Campbell Barton
d9fa6db75b weight paint mirror, move duplicate code into a function. 2011-05-26 22:20:29 +00:00
Peter Schlaile
4b9a63c6d3 == FFMPEG ==
* removed a lot of old cruft code for ancient ffmpeg versions
* made it compile again against latest ffmpeg / libav GIT
  (also shouldn't break distro ffmpegs, since those API changes
  have been introduced over a year ago. If it nevertheless breaks,
  please send me an email)
2011-05-26 21:57:02 +00:00
Campbell Barton
78b8e4a437 remove BLI_streq() since it was hardly used, also replace string search with BLI_findstring(). 2011-05-26 21:04:01 +00:00