Commit Graph

103 Commits

Author SHA1 Message Date
Lina Halper
ddffe4fb9f Merging
//depot/UE4-Orion/Engine/Source/Editor/AnimGraph/...

to //depot/UE4/Engine/Source/Editor/AnimGraph/...

[CL 2486884 by Lina Halper in Main branch]
2015-03-20 18:05:34 -04:00
Jaroslaw Palczynski
28fc7695a0 Missing chages for 2481343.
Some P4V problem with backing out large changelist missed some files.

#codereview Robert.Manuszewski

[CL 2481366 by Jaroslaw Palczynski in Main branch]
2015-03-17 06:17:32 -04:00
Jaroslaw Palczynski
f23f29257b Back out changelist 2481333
Rob asked me to back out GENERATED_*_BODY -> GENERATED_BODY change for now until the "_Validate and _Implementation auto-generation" discussion is over.

#codereview Robert.Manuszewski

[CL 2481343 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:38:32 -04:00
Jaroslaw Palczynski
fa31560e2d Enabled UHT to digest GENERATED_BODY instead of GENERATED_UCLASS_BODY, GENERATED_USTRUCT_BODY, GENERATED_UINTERFACE_BODY or GENERATED_IINTERFACE_BODY, changed every occurence to the new syntax and fixed every warning that have fallen out of this change.
#codereview Robert.Manuszewski

[CL 2481333 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:19:11 -04:00
Phillip Kavan
e67b6775e3 [UE-11369] Fix potential crash on select of existing "Two Bone IK" nodes in an animation graph.
- introduced in CL# 2443244 (Fix manipulation of transforms on bone control nodes so that selecting a node doesn't overwrite its conents)
- seems like existing (older) nodes could potentially have serialized an empty default value string for the vector location pins; fixed by checking for that and allowing it to fall back to the zero vector in that case

#codereview Martin.Wilson

[CL 2471588 by Phillip Kavan in Main branch]
2015-03-06 16:33:54 -05:00
Gil Gribb
35cf42566a UE4 - merge GDC branch, code @2465640 to main
[CL 2468685 by Gil Gribb in Main branch]
2015-03-04 08:31:40 -05:00
Saul Abreu
79a26091bf Fixed behavior on FString::ParseIntoArray (muliple delimiters overload) functionality to support optionally culling empty strings. Greatly simplified implementation logic. Output parameter now properly named and taken by reference.
#codereview Steve.Robb, Robert.Manuszewski

[CL 2466824 by Saul Abreu in Main branch]
2015-03-02 15:51:37 -05:00
Marc Audy
5a9d2471d9 Fix shadowed variables
[CL 2456886 by Marc Audy in Main branch]
2015-02-23 16:18:13 -05:00
Laurent Delayen
e586cd3a8f Dev to Main integration from CL #2446290
[CL 2456855 by Laurent Delayen in Main branch]
2015-02-23 15:58:14 -05:00
Michael Noland
e36f1cb006 Animation: Add a prototype for automagic transition rules when there is a single player node in the source graph
- Defines the can take transition rule as Player.CurrentTime + CrossfadeDuration >= Player.SequenceLength
- Opt-in on the transition node, when enabled the BP transition rule is ignored and the automatic rule is evaulated directly in C++
[INTEGRATE] Change 2454970

[CL 2455144 by Michael Noland in Main branch]
2015-02-21 20:06:12 -05:00
Marc Audy
e5ba044eb0 Fix shadowed variables
[CL 2451810 by Marc Audy in Main branch]
2015-02-19 12:13:52 -05:00
Matthew Griffin
2a70e91797 [INTEGRATE] Change 2443244 by Martin.Wilson@Pitbull-MWilson on 2015/02/12 07:06:56
Fix manipulation of transforms on bone control nodes so that selecting a node doesn't overwrite its conents

	#codereview Michael.Noland

[CL 2449794 by Matthew Griffin in Main branch]
2015-02-18 03:59:11 -05:00
Matthew Griffin
2d19921ebd [INTEGRATE] Change 2440548 by Dan.Oconnor@epic_3298 on 2015/02/10 17:50:56
[UE-9334] Fix for crash that occured when working with anim blueprints and the old menuing system. Origin was 2340250

[CL 2448569 by Matthew Griffin in Main branch]
2015-02-17 08:54:08 -05:00
Martin Wilson
9f07fc3c71 Fix crash in bone control widget when blueprint needs recompiling
[CL 2441883 by Martin Wilson in Main branch]
2015-02-11 12:30:09 -05:00
Lina Halper
5c5b423292 #ANIM: Blueprint creation
- Make sure it doens't refresh parent classes based on skeleton - very confusing
- Exclude SingleNodeInstance and PreviewInstance to be not BP-table - it won't work.

#code review: Martin.Wilson

[CL 2428689 by Lina Halper in Main branch]
2015-02-02 16:26:55 -05:00
Graeme Thornton
b7f66f40b8 Change many string replace/compare/find operations which use a fixed case search pattern to be case sensitive. This avoids unnecessary expensive string case operations when searching for things like dots and slashes.
[CL 2425834 by Graeme Thornton in Main branch]
2015-01-30 10:52:42 -05:00
Thomas Sarkanen
4cefea89d7 Native transition rules & state entry/exit event delegates
Added support for binding native delegates to transition rules.
Changed callback for state entry/exit to also use delegates.
Bindings are registered before InitializeAnimation() is called (usually in your class constructor), then bound to states & transitions after the state machine has been initialized.
Added indicator in details panel when a transition is using a native rule.
Modified AnimBlueprint compiler so that 'always transition' warnings are not generated when a native delegate is installed.

reviewed by Martin.Wilson

[CL 2418613 by Thomas Sarkanen in Main branch]
2015-01-26 10:27:51 -05:00
Dan Oconnor
6ae9c6cac0 Blueprint editor no longer purges SGraphNodes when a node is removed, disabled for all schemas except 'clean' k2 schema because of risk
[CL 2414958 by Dan Oconnor in Main branch]
2015-01-21 23:54:10 -05:00
Dan Oconnor
2efabfa541 Back out changelist 2411626
I fixed the crash found in the material editor, but discovered some rendering issues. Backing this out for now.

[CL 2412583 by Dan Oconnor in Main branch]
2015-01-20 14:04:44 -05:00
Dan Oconnor
b0c9f152da We no longer refresh the graph panel when a user deletes or adds a graph node. This is a substantial improvement in responsiveness, especially when the user is editing large graphs.
[CL 2411626 by Dan Oconnor in Main branch]
2015-01-19 18:54:38 -05:00
Lina Halper
adb3310cb7 PR #725: exposing class can be properly subclassed in non-engine modules. (Contributed by wackoisgod)
https://github.com/EpicGames/UnrealEngine/pull/725

[CL 2401147 by Lina Halper in Main branch]
2015-01-08 13:32:42 -05:00
Jamie Dale
a569f6b356 Fixed code relying on SLATE_TEXT_ATTRIBUTE for STextBlock.
UETOOL-213 - Minimize Slate FString -> FText conversion (remove SLATE_TEXT_ATTRIBUTE)

This fixes any editor/engine specific code that was passing text to Slate as FString rather than FText.

[CL 2399803 by Jamie Dale in Main branch]
2015-01-07 09:52:40 -05:00
Lina Halper
4770fc4c22 #Anim : Fixed save cached pose node warning message
- We now don't check verification on skeleton class
- Moved Validation to EarlyValidation

#lockdown  Zachary.EdgertonJones

[CL 2390497 by Lina Halper in Main branch]
2014-12-16 17:44:46 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Hyojong Shin
22f2c45997 support WER keys to change gizmo mode for Bone Controller Preview in Anim blueprint
#code_review : Lina.Halper

[CL 2373321 by Hyojong Shin in Main branch]
2014-12-01 21:27:36 -05:00