Commit Graph

3051 Commits

Author SHA1 Message Date
14a2330d7b copied across changes which were missed by merging. 2011-05-09 02:45:52 +00:00
31471f644c Merged changes in the trunk up to revision 36551.
Conflicts resolved:
source/creator/SConscript
2011-05-09 01:38:29 +00:00
6ef77cf95a =bmesh= merge from trunk at r36529 2011-05-08 23:43:18 +00:00
d4e540dff3 comment some unused code. 2011-05-08 10:29:40 +00:00
b9d4121283 Merged changes in the trunk up to revision 36408. 2011-05-01 13:50:38 +00:00
1093f69e50 Style Cleanup
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
2011-05-01 10:14:09 +00:00
9736061c07 =trunk=
Made some improvements to the point density texture.  Added support
for tweaking the falloff with a custom curve.  Also coded new
falloff types based on the age or velocity of particles.

Also added a test break check to the volumetric shade cache code,
to avoid nasty hangups from the preview render (on render, exit,
etc).
2011-05-01 03:57:53 +00:00
d2218cb7f3 Fix one more crash introduced with r36384: trying to bake resulted in a segfault
Also, use tabs for indentation in previous fix for the same crash
2011-04-30 13:47:25 +00:00
14e2ac09eb fixed a crash introduced in r36384
where the preview render was calling getCam before setting the scene.
2011-04-30 10:02:23 +00:00
e7ffd32a61 use camera render argument to avoid temp overwriting the scene camera.
also fix for mistake with rendering stars from previous commit.
2011-04-30 05:42:37 +00:00
c4c22d4e9f - pass the camera to the render stamp function.
- add BKE_write_ibuf_stamp() since saving environment maps & screen shots shouldn't have stamp.
2011-04-30 05:26:09 +00:00
abcdf9573a add back support for rendering local view camera. 2011-04-30 04:29:36 +00:00
f3a9b7580e spelling corrections. 2011-04-29 04:43:36 +00:00
bc6828426d fix [#27174] World Starfield Generation causes crash
allow escaping from render if generating stars takes too long.
2011-04-27 08:32:20 +00:00
f9cb8f80e7 fixed some issues with the new "shadow only + shading" code.
patch from MiikaH.
2011-04-26 15:29:12 +00:00
8fdebf24f4 harmless changes to quiet clang static check warnings.
- made EXPANDED_AGRP take bAnimContext as an argument.
- remove unneeded NULL check drawFacesColored functions.
- comment some vars which are set but not used.
2011-04-24 10:51:45 +00:00
bd860f89e7 Merged changes in the trunk up to revision 36301. 2011-04-23 22:08:18 +00:00
040a049fb1 Fix #27048: text + SimpleDeform modifier = weird render result!
It's not real fix, just patch which makes things better by using average
normal for each displist separately. There are still some artifacts with
quite highly deformed letters "O" or "g", but correct fix would need
to calculate derivative of modifiers, which isn't implemented yet.
2011-04-23 15:27:35 +00:00
ee9ea98e48 zoom operator.
- continue zoom now uses the same options as dolly (hoz/vert & invert).
- remove event mouse coord hack to bypass touchpad zoom invert, instead pass invert as an argument.
2011-04-22 14:47:35 +00:00
f9f771cd01 converted more mixed tab/space indentations to tabs. only whitespace changes. 2011-04-21 15:53:30 +00:00
210ee1ade4 whitespace only, no functional change mixed tabs/spaces --> tabs. 2011-04-21 13:11:51 +00:00
26916206f8 fix [#27084] Crash when chosing non-voxel data file in voxel data texture input
also found loading voxel textures wasn't closing files it opened.
2011-04-21 00:28:05 +00:00
217d1aa461 fix [#26900] Problem with active camera between scenes 2011-04-19 06:15:13 +00:00
2497af95a1 Merged changes in the trunk up to revision 36199. 2011-04-17 14:20:43 +00:00
4bb277117f Fix for composite node parameter animation not working with Freestyle.
The problem was reported by ikeahloe together with a .blend file for
reproducing the issue.  Thanks!
2011-04-17 02:47:32 +00:00
7f598451fc fix [#26906] Panorama Button (Camera Data Properties)
- render check for ortho/panorama combination wasn't working since the flags were not initialized at the time of checking.
- disable panorama button in ortho mode.
2011-04-15 12:08:17 +00:00
c8798090a7 style changes & replace some memset's with zero initializers. 2011-04-15 01:43:30 +00:00
a41c0c324a fix [#26937] Radio button text truncation should start at beginning of string
ensure start of text is always visible.

- also left in test for fix [#26933] which left it broken.
- quiet warning in AUD Py API.
2011-04-15 01:32:37 +00:00
c98148a963 =bmesh= merge from trunk at r36153 2011-04-15 01:19:13 +00:00
5e26763b40 fix [#26933] Render Crash with Decimate Modifier 2011-04-14 17:22:05 +00:00
d9c2497859 no functional change, avoid making a 4 pointer array just for an index lookup for tangents, orcos and normals. 2011-04-14 16:41:17 +00:00
5d850c16bf fix [#26902] Raytracing black dots
derivatives from reflected duplis were not taking object instance transformation into account.
2011-04-14 16:13:32 +00:00
d14738a560 report missing engines on file load. (request from Martin). 2011-04-12 15:55:38 +00:00
3df52d4e19 Merged changes in the trunk up to revision 36092.
Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
2011-04-11 00:09:56 +00:00
2afae38019 Bugfix #26842
Compositor: when using RenderLayer nodes from other scenes and FSA,
Blender crashed because these nodes didn't get a 'tag' for refresh.
2011-04-10 18:15:24 +00:00
1c6956a4d6 quiet msvc/mingw compiler warnings. 2011-04-10 09:37:04 +00:00
09c7d5aeb8 Merged changes in the trunk up to revision 35972. 2011-04-03 12:46:33 +00:00
69bd72c3b6 quiet gcc float -> double promotion warnings. 2011-04-02 02:08:33 +00:00
18fd4d3137 Partial fix for #26673: sss + normal map wasn't compatible with previous versions. 2011-04-01 16:01:29 +00:00
e339acf3a9 fix for a crash when loading a new blend file which had a scene with the same name as the old one, the freed backbuffer image from the previous blend file would get reused.
also NULL the bakebuf just incase its accessed in future though at the moment this isnt causing any problems.
2011-03-31 05:20:48 +00:00
0297b6c8c6 Fix #26637: another problem with recent normals change, objects with negative
scale did not get correct render normals.
2011-03-29 13:37:16 +00:00
e72c278f47 2 fixes for un-initialized memory uses, when running testfile: teapot_envmap.blend
boxsample() expected talpha to be set beforehand, also dont set the int value as a float since its confusing.
2011-03-29 01:47:03 +00:00
040f0a1096 Merged changes in the trunk up to revision 35828.
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.
2011-03-27 23:11:22 +00:00
9a997093d7 scon fixes 2011-03-26 00:28:10 +00:00
11920f7880 Bugfix #26195
When rendering, during processing scene data, drawing in 3d window
is now locked. Can get extended to more areas in UI easily.

At least this solves all crashes with conflicting memory access in
render && 3d drawing. Deleting objects via operators or delete 
modifiers isn't locked yet.

Also fixed: crash on quitting a renderwindow when it was rendering.
2011-03-25 17:11:32 +00:00
22ea604c6f Bugfix 26578
"Warp" texture map option didnt work for new bump methods yet.
Also fixed to not grey out bump menu for this mapping option.
2011-03-24 18:39:54 +00:00
261f74115d Fix #26571: slow approximate AO with zero area faces. 2011-03-23 23:07:09 +00:00
67cbf22211 Bugfix #26549
Using environment map type "load" increased user counter on each
preview render.

Also noticed that this type of envmap use wasn't threadsafe, causing
imbufs being allocated for all threads. Also fixed that.
2011-03-21 17:10:55 +00:00
b71efb4152 Fix #26557: dots near alpha borders on textures. Tweak threshold in alpha
de-premul for image textures to avoid float precision issues.
2011-03-20 15:03:13 +00:00
549b5e1222 Fix/change in normal computation, now the viewport uses the same angle
weighted normals as the render engine, and the render engine will copy
normals from the mesh rather than always recalculating them.

Subsurf/multires still use regular vertex normals, but they are expected
to be sufficiently high resolution to not need this.

This means that normal maps displayed in the viewport actually match the
render engine exactly and don't have artifacts due to this discrepancy.
It of course also avoids unexpected surprises where your render normals
look different than your viewport normals.

Subversion bumped to 4 for version patch to recalculate normals.

Patch by Morten Mikkelsen, with some small changes.
2011-03-20 13:35:35 +00:00